Cherry-picking commits from master

https://github.com/rcbops-cookbooks/nova/commit/0b79402da5a28e689bc8922a90483995099514c8
https://github.com/rcbops-cookbooks/nova/issues/381
https://github.com/rcbops-cookbooks/nova/issues/383

References https://github.com/rcbops/chef-cookbooks/issues/801