Making the useOldStylePermissionsOn2dot4 switch on add_user affect permissions model used, but not whether to restart the server with respect to the auth configuration variable
Merge branch 'useDeprecatedPermissions'

Conflicts:
	templates/add_user.sh.erb