Update to DeployPageLayout, DeployMasterPage

Reference https://github.com/OfficeDev/PnP/issues/66