adjustments for NIFTy_5

Martin Reinecke requested to merge adjust_for_nifty5 into master

Merge request reports