acu140093 - set default for new block_device param
Merge branch 'release13.05.01' of github.com:rightscale/rightscale_cookbooks_private into release13.05.01