Merge "Install openstack-heat-agents on upgrade" into stable/ocata