correct machine names of panelizer defaults for basic pages
Merge branch 'refs/heads/master' into test