Merge branch 'bp_dev/racksapce-win-resource' of https://github.com/vikomall/heat
Merge commit 'refs/changes/42/47042/12' of https://review.openstack.org/openstack/heat
Merge branch 'bp/new_clb_design' of https://github.com/andrew-plunk/heat
Merge branch 'DBaaS_rate_limit' of https://github.com/vikomall/heat
Merge branch 'chef_solo_non_blocking' of https://github.com/andrew-plunk/heat
Merge branch 'impacket_clone' of https://github.rackspace.com/andr5956/heat
Merge branch 'bp/quick-multi-region' of https://github.com/andrew-plunk/heat
Merge commit 'refs/changes/51/64451/1' of https://review.openstack.org/openstack/heat
Merge branch 'cloud_lb_fix' of https://github.com/andrew-plunk/heat
fix merge