o Swith to m-site-p 3.3 and remove the workaround for MSITE-670
Merge branch 'apache/master'