Adjust contrib location, minor adjustments

Change-Id: I0a962f487ac3362b209422554286e76441daa06a

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 branch = True
-omit = etc/*,setup.py,*egg*,.tox/*,barbican/tests/*,*barbican/openstack/*,*barbican/functionaltests/*,*barbican/contrib/*
+omit = etc/*,setup.py,*egg*,.tox/*,barbican/tests/*,*barbican/openstack/*,functionaltests/*,contrib/*
 
 [report]
 ignore_errors = True

contrib/devstack/extras.d/70-barbican.sh

@@ -7,8 +7,8 @@ if is_service_enabled barbican; then
         source $TOP_DIR/lib/barbican
     elif [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing Barbican"
-        install_barbicanclient
         install_barbican
+        install_barbicanclient
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring Barbican"
         configure_barbican

functionaltests/pre_test_hook.sh

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# This script is executed inside pre_test_hook function in desvstack gate.
+# This script is executed inside pre_test_hook function in devstack gate.
 
 # Install barbican devstack integration
 BARBICAN_BASE=/opt/stack/new/barbican/contrib/devstack

tox.ini

@@ -24,4 +24,4 @@ commands = {toxinidir}/tools/hacking.sh {posargs}
 # E711 ignored because of sqlalchemy override of == None
 # H ignored because it's not H clean
 ignore = E711,H
-exclude = .git,.idea,.tox,bin,dist,debian,rpmbuild,tools,*.egg-info,*openstack/common
+exclude = .git,.idea,.tox,bin,dist,debian,rpmbuild,tools,*.egg-info,*openstack/common,contrib,functionaltests