Merge branch 'master' into common-logging-220-upgrade
Merge branch 'master' into common-logging-220-upgrade
add missing xml comment file