Fix pushkin prep for existing container and non-Pushkin site templates#370

cherriechang wants to merge 1 commit intomainpushkin-consortium/pushkin:mainfrom

prep-graceful-handle-container-existpushkin-consortium/pushkin:prep-graceful-handle-container-existCopy head branch name to clipboard