LPS-41603 Partial revert original fix from LPS-35963, which causes regression bug
LPS-41603 Move setPortletScope method to LayoutImporter (no logic changes) - calling an explicit return in the PortletImporter when the portlet import is in process makes this code unused
LPS-41603 Apply refactoring changes, thus preserving part of the original fix