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
added --user and --group options for CLI to work better with non-apache (nginx) installs See merge request !208