Add apache2 element to horizon image build
Remove some unnecessary changes

These changes were obsoleted by changes elsewhere.