BZ #1123316 - Add nova-conductor with nova-scheduler to colocation constraint

https://bugzilla.redhat.com/show_bug.cgi?id=1123316
Merge pull request #332 from jguiditta/ha_constraints

BZ #1123316 - Add nova-conductor with nova-scheduler to colocation const...
BZ #1123316 - Add nova-conductor with nova-scheduler to colocation constraint

https://bugzilla.redhat.com/show_bug.cgi?id=1123316
Merge remote branch 'upstream/master'