Fixes required to get java api-lib unit test running
Merge branch 'master' of github.com:Juniper/contrail-controller