merge updates from development branch to SL6

I'd merge this and then tag the merge as new SL6 release.
@nucleosynthesis can you check that the merge for the diffNuisance plots makes sense?