Merge branch 'hotfix'
added default context option in httpd.openSsl
Merge branch 'hotfix'
git-commit-id-plugin forceLongFormat var is changed to true in pom.xml
Merge branch 'uidev'
Merge branch 'uidev'
Merge branch 'uidev'
Merge branch 'uidev'
Merge branch 'uidev'
localized string in log source added
Merge branch 'master' into uidev