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"