Bz1018959: Remove dual branding from the kitchensink-generated quickstarts and replace AS 7 instances