Disable priv/unpriv auth services when necessary (SOFTWARE-5478)

Services are enabled by default so we need to explicitly disable the
relevant services or face race conditions

Author: brianhlin

stash-origin/image-config.d/10-stash-origin.sh

@@ -16,9 +16,13 @@ if [[ $XC_AUTH_ORIGIN_EXPORT ]]; then
   if [[ -n $XC_ENABLE_MULTIUSER ]]; then
     supervisord_enable stash-origin-auth-privileged
     supervisord_enable stash-origin-auth-cmsd-privileged
+    supervisord_disable stash-origin-auth
+    supervisord_disable stash-origin-auth-cmsd
   else
     supervisord_enable stash-origin-auth
     supervisord_enable stash-origin-auth-cmsd
+    supervisord_disable stash-origin-auth-privileged
+    supervisord_disable stash-origin-auth-cmsd-privileged
   fi
 else
   supervisord_disable stash-origin-auth-privileged