Fix service keystone conflict when running in apache

service keystone is started after the package is installed. When
running keystone inside apache, we must ensure service keystone
is neither running nor start at boot.

This fixes error of apache during start: 'Address already in use:
make_sock: could not bind to address host:35357'

Change-Id: Ie761450ea05a0c92e595b12d1c7ced9481eb967c
Update httpd/keystone for icehouse

Update files/httpd/keystone.py to date with current version from
project keystone, branch stable/icehouse

This file is used by apache to start keystone as wsgi service.
But at the moment this file is not installed by canonical package
keystone and we have to deliver it via puppet until they include
in the package

SMBCAP-5552