Merge "Remove multisite support"

diff --cc docker/Dockerfile
index 910be83,fe91852..2cbee66
--- 1/docker/Dockerfile
--- 2/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -14,9 -14,8 +14,8 @@@ LABEL version="0.1" description="OPNFV 
  # Environment variables
  ARG BRANCH=master
  ARG RALLY_TAG=0.8.1
 -ARG ODL_TAG=release/beryllium-sr4
 +ARG ODL_TAG=release/carbon
  ARG OPENSTACK_TAG=stable/ocata
- ARG KINGBIRD_TAG=1.1.0
  ARG VIMS_TAG=stable
  ARG VROUTER_TAG=stable
  ARG REPOS_DIR=/home/opnfv/repos

diff --cc functest/ci/config_functest.yaml
Simple merge

diff --cc functest/ci/testcases.yaml
Simple merge

diff --cc requirements.txt
Simple merge