[v4.1.5rc] cherry-pick commits from master

cherry picks commits from https://github.com/rcbops-cookbooks/nova/pull/381 and
https://github.com/rcbops-cookbooks/nova/pull/383

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