Merge pull request #1131 from jay-hodgson/release-55

change paths
Backout changes
Merge branch 'release-55' into backout-log4j-changes

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge pull request #1132 from xschildw/backout-log4j-changes

Backout log4j changes
Merge pull request #1133 from jay-hodgson/release-55

use tooltip instead of popover until we have a way to dismiss it.  also ...
Merge pull request #1134 from jay-hodgson/release-55

fix build via lazy init
SWC-1650