update correct apache user
Merge branch 'master' into demo