Contrail plugin fixes -master branch, single commit, no transaction wrappers

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>