Simplify site-spec step to name and layout only#2845

youknowriad merged 2 commits intotrunkAutomattic/studio:trunkfrom

trim-site-spec-stepAutomattic/studio:trim-site-spec-stepCopy head branch name to clipboard