Revert "Merge pull request #689 from Doude/bug/1313544"

This reverts commit 26f390aaac6cee807da4c6dcb245c0d51eff9670, reversing
changes made to 448772eb9f9e3eb2b0c98cd95638a734fa880520.

Conflicts:
	src/config/svc-monitor/svc_monitor.py

Closes-bug: #1313544
Change-Id: Id6a1c414184407203b058b612c0846e422c65d9c
vCenter: create new VNs in VncApi

Change-Id: Id82d742aed5625736062bf1a7122d9fe0c38a368
Force load kstate library so that the HTML file for kstate is listed in agent
introspect page

Change Id: I74d6fc7f5664e75e2d8a29fee271fbb3fc69375b

Change-Id: If7a8f6138422df758dcd1bc25bf42985f520ac06
Use VMI ID directly as argument (adapts to change where VMI parent is project)

Change-Id: Id37a57c747db98676243269688a94be58e237ad9
Increase the width of version field in contrail-version script output for both CentOS and Ubuntu

Change-Id: Iee4b680372d23b06d7434ee4f199dba17dc0c13f
Merge "Increase the width of version field in contrail-version script output for both CentOS and Ubuntu"
Schema transformer changes to support multiple in-network service chains

  Change-Id: I298b9e0576c469b938efbbfb3a287b72f12742e3

Change-Id: Ifb3c9796abc49096aad6cd447f810704203c071f
Bug 2911: Do not publish if any of the ifmap ids is ERROR

Change-Id: I5525e39a7972f02ab5283a362365ffe4897e3748
Merge "vCenter: create new VNs in VncApi"
Compile vcenter-monitor

Change-Id: If268ab5ed6a0b9dd22e49d1b58b5c78191c07fae
UVE name changes for consistency

Change-Id: I36de82d9ad4e8be949604287e0e8c6859d86a0bf
Merge "Schema transformer changes to support multiple in-network service chains"
Merge "Bug 2911: Do not publish if any of the ifmap ids is ERROR"
Merge "UVE name changes for consistency"
Merge "Revert "Merge pull request #689 from Doude/bug/1313544""
Merge "Compile vcenter-monitor"
Fix bug 3011 which was introduced because of a merge error. Also fixed some flake8 issues

Change-Id: Ib94f91a800ec82ce5286bfe5508c6f95a41be22f
xen: Fix segfault during xen bringup

Change-Id: Ibb4706488a3f0b55d4ce53d0f153b5e470e8b497
Signed-off-by: Anirban Chakraborty <abchak@juniper.net>
Compile java contrail-vrouter-api library

Change-Id: I425befcdc003b29b92ed0a2fc5ea4d617f1f720a
Merge "xen: Fix segfault during xen bringup"