Fix minor issues in quickstart master templates and bring them in sync between the various template engines