Merge branch 'v2.0' into 'v2.0'

added --user and --group options for CLI to work better with non-apache (nginx) installs

See merge request !208
5 jobs for v2.0 in 9 minutes and 26 seconds (queued for 10 seconds)