This is an Ocata backport of Jay patch for adding support for two new policies aggregate-affinity and aggregate-anti-affinity. https://review.openstack.org/#/c/529201