[MRM-459] better rationalisation of commons-logging and partially revert r593206 as logging had stopped working altogether