make sure pages do not delete menu points and the that menu points with children cannot be deleted
Merge branch 'refs/heads/master' into 2.1