LPS-47827 Refactor, no logical changes
LPS-47827 Auto-add "include-and-override=portlet-ext.properties" to portlet.properties when missing