Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
reducing execution time
changing project name to contrail_controller
Revert "reducing execution time"

This reverts commit c9ae1670ab44b968e5b3d427d6abb9ea1c6a65a4.
Merge pull request #13 from vmahuli/master

Changing project contrail-controller to contrail_controller