Fix merge driver commons-loggin version
Merge remote-tracking branch 'origin/master' into 3.1/rcp