LPS-31740 code cleanup
LPS-31740 page template reset and merge from Page Settings portlet
LPS-31740 ant format-source
LPS-31740 added missing error message