Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev