fix commons-logging dep
Merge branch 'master' into dao-refactor