diff --git a/clean.sh b/clean.sh
index 8d7fae91..a2bd7214 100755
--- a/clean.sh
+++ b/clean.sh
@@ -30,6 +30,7 @@ if [[ -d $BASE_DEVSTACK_DIR ]]; then
     bash -c "
         cd $BASE_DEVSTACK_DIR; \
         source stackrc; \
+        source lib/apache; \
         source lib/tls; \
         source lib/cinder; \
         DATA_DIR=${STACK_ROOT}/data; \
@@ -47,6 +48,7 @@ if [[ -d $TARGET_DEVSTACK_DIR ]]; then
     bash -x -c "
         cd $TARGET_DEVSTACK_DIR; \
         source stackrc; \
+        source lib/apache; \
         source lib/tls; \
         source lib/cinder; \
         DATA_DIR=${STACK_ROOT}/data; \
diff --git a/projects/30_swift/shutdown.sh b/projects/30_swift/shutdown.sh
index 15305a66..29e8510d 100755
--- a/projects/30_swift/shutdown.sh
+++ b/projects/30_swift/shutdown.sh
@@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
 # We need base DevStack functions for this
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
+source $BASE_DEVSTACK_DIR/lib/apache
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/swift
 
diff --git a/projects/30_swift/upgrade.sh b/projects/30_swift/upgrade.sh
index 538d8d47..36897f67 100755
--- a/projects/30_swift/upgrade.sh
+++ b/projects/30_swift/upgrade.sh
@@ -39,6 +39,7 @@ set -o errexit
 source $TARGET_DEVSTACK_DIR/stackrc
 
 FILES=$TARGET_DEVSTACK_DIR/files
+source $TARGET_DEVSTACK_DIR/lib/apache
 source $TARGET_DEVSTACK_DIR/lib/tls
 source $TARGET_DEVSTACK_DIR/lib/keystone
 source $TARGET_DEVSTACK_DIR/lib/swift
diff --git a/projects/40_glance/shutdown.sh b/projects/40_glance/shutdown.sh
index a63346e8..fe648a04 100755
--- a/projects/40_glance/shutdown.sh
+++ b/projects/40_glance/shutdown.sh
@@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
 # We need base DevStack functions for this
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
+source $BASE_DEVSTACK_DIR/lib/apache
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/glance
 
diff --git a/projects/40_glance/upgrade.sh b/projects/40_glance/upgrade.sh
index 7822ebd7..7d179fd0 100755
--- a/projects/40_glance/upgrade.sh
+++ b/projects/40_glance/upgrade.sh
@@ -38,6 +38,7 @@ set -o errexit
 
 # Get functions from current DevStack
 source $TARGET_DEVSTACK_DIR/stackrc
+source $TARGET_DEVSTACK_DIR/lib/apache
 source $TARGET_DEVSTACK_DIR/lib/tls
 source $TARGET_DEVSTACK_DIR/lib/glance
 
diff --git a/projects/50_neutron/shutdown.sh b/projects/50_neutron/shutdown.sh
index dec7b94c..90eae205 100755
--- a/projects/50_neutron/shutdown.sh
+++ b/projects/50_neutron/shutdown.sh
@@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
 # We need base DevStack functions for this
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
+source $BASE_DEVSTACK_DIR/lib/apache
 source $BASE_DEVSTACK_DIR/lib/tls
 # TODO(sdague): remove this conditional once we've branched
 # grenade. Right now we need to support stable/mitaka, stable/newton,
diff --git a/projects/70_cinder/shutdown.sh b/projects/70_cinder/shutdown.sh
index 6e60d77a..0607a118 100755
--- a/projects/70_cinder/shutdown.sh
+++ b/projects/70_cinder/shutdown.sh
@@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
 # We need base DevStack functions for this
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
+source $BASE_DEVSTACK_DIR/lib/apache
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/cinder
 
diff --git a/projects/70_cinder/upgrade.sh b/projects/70_cinder/upgrade.sh
index 020c1f6a..7ebbe04c 100755
--- a/projects/70_cinder/upgrade.sh
+++ b/projects/70_cinder/upgrade.sh
@@ -37,6 +37,7 @@ set -o errexit
 # ==============
 
 source $TARGET_DEVSTACK_DIR/stackrc
+source $TARGET_DEVSTACK_DIR/lib/apache
 source $TARGET_DEVSTACK_DIR/lib/tls
 source $TARGET_DEVSTACK_DIR/lib/cinder