Fix v6r11 fts 140317

This PR contains all changes from PR1870 merged with RM->DM changes. It has priority on a patch to v6r10 since we want to commission v6r11 quickly and LHCbDirac v7r15 is running with all those changes.