Merge "Enable apache conf for cinder-wsgi"