changed smoke behavior
Merge branch 'release/roxy/master' of https://github.com/tsipa/barclamp-nova into release/roxy/master