MOdify ui flags
Merge branch 'master' of https://github.com/Ankitja/contrail-test