Add rebase step to tests
Merge branch 'master' of http://github.com/mikalstill/openstack-ci-tools