Re #10647 All collected together
Re #10674 This should fix it
Re #10674 Deleted unused (and not working) old parameter files

and properly modified one which used.
Re #10674 Better formatted diagnostics

(does it have anything to do with failing unit test?)
Re #10674 minor niceness
Merge remote-tracking branch 'origin/bugfix/10674_hardmaskOpt'