Merge pull request #1119 from jay-hodgson/develop

merge from release-54
Merge pull request #1121 from jay-hodgson/develop

merge from release-54
updated
Merge pull request #1122 from john-hill/update-plfm

updated
SWC-1626: add profile edit form into Settings tab, and go to Settings on edit profile
fix tests
more layout cleanup
update logging in window to a bootstrap3 dialog
added tests
extend profile place token to include area (tab)
added tests
SWC-1644: quick fix
Merge pull request #1123 from jay-hodgson/SWC-1626

Swc-1626: move profile edit form into Settings tab.
Upp'ed memory for build
Merge pull request #1125 from xschildw/release-55

Upp'ed memory for build
Update log4j version.
Merge pull request #1126 from xschildw/update-log4j2-version

Update log4j version.
Match doc.
Merge pull request #1127 from xschildw/update-log4j2-version

Match doc.
revert logging in bootstrap3 window, and fix build with latest repo release ver