Revert "PLF-5158 : NullPointerException when click Abort button after edit layout of portal"

This reverts commit 8204419f4fd88897cf0c292061fdd578c6a4d0e7.
PLF-5235: Remove redundant resource bundle files of other languages
Merge commit 'f4c75aac090052b37dfc6beb9c75d90f7e8f0f96' into HEAD