Move page type layout files site_ref folder
Fix $this issue in PageType and remove core page_type path
Merge branch 'refs/heads/2.3/develop' into 3.0/develop