fix merge with develop, fix framework/easyconfigs unit tests on top of this

see commits d14da08, 21b1580, f630bc3, 8a5d9a6 for the relevant stuff, do check them before you hit the magic green button pls