Revert "Merge branch 'require-all-templates-to-include-default-stages-ee' into 'master'"