LPS-40576 Fix StructureXsdException
Revert "LPS-40761 SF"

This reverts commit 7f889ed018c66bc3a719901db3e09427a82d0eac.
Revert "LPS-40761 Updating references to old calendar portlet in layouts and pages"

This reverts commit 384fca91a700e1d0317f01158429b41ebfd81e1e.