Make sure that apache2 doesn't start.
Separate 'user' and 'branch' for tools and appscale.
Revert a change not belonging to this branch.
Merge pull request #1529 from obino/dont-use-apache

Make sure that apache2 doesn't start.