Updated openstack/openstack
Project: openstack/requirements  033cdbe7c1f3ca1d7c48bb6a6eab6eece10bc7c1

Fix sphinx requirement to add overlap

When I63c6159eb23430a181eb20016b35366c2fbbf9f8 was implemented it
didn't include any overlap with the previous required versions,
which causes breakage in the gate while the change is being tested
and until the mirror updates. For completeness add the suggested
overlap back in for now.

Change-Id: I70559a2b6eb961bf1c5fbe8006cd1275c39577b6
Co-Authored-By: Doug Hellmann <doug.hellmann@dreamhost.com>
Updated openstack/openstack
Project: openstack-dev/devstack  fcd03d71bf354bff1e81558efbdd817853eefcc1

Use apache2ctl after apache is installed.

Ensure that apache2ctl is only called if apache2 is being used when
setting up Keystone. This patch corrects a case where apache2ctl
is being called at the time lib/keystone is being sourced. This
error breaks attempts to deploy Keystone under apache unless
apache is already installed at the time stack.sh is run.

Change-Id: I02d426438fa1246effd68c6bb3c3358910ed4c05