Merge pull request #282 from rcbops/sprint

End of Sprint 16 Merge
Merge branch 'master' of github.com:rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks into sprint
fix openstack-ha role name
Merge pull request #288 from mancdaz/sprint

fix openstack-ha role name