Support using frozen contrail bits with devstack
skip make fetch-pkgs-prod
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'dsetia/master'