GBR diphoton/dijet MVAs first round of debugging

There is an incompatibility between combine and GBR likelihood dictionaries that makes it impossible to switch it on at run time at the moment.