don't always rebuild contrail
Merge branch 'contrail' of https://github.com/noelbk/devstack into contrail