Sync with heat-jeos, run tests with testr

As soon as this is merged I'll start working on removing cfntools from heat-jeos