Fix debug message for GroupAntiAffinityFilter

Fix bug 1198109

The log message in not accurate for GroupAntiAffinityFilter, it
should be fixed as "Group anti affinity"

Change-Id: Ib58c2934626c28349dd49bafd1b3e781fcbe9cb9
Fix aggregate update.

Bug description: when update 'availability_zone'
value existing aggregate metadata cleared.

Method aggregate_update() in sqlalchemy api updated.

Fix bug 1200369.

Change-Id: Ie1dffa90b1e339b81883dc14037f7817f1cec15d
Don't ignore 'capabilities' flavor extra_spec

The ComputeCapabilitiesFilter would improperly ignore an extra spec of
'capabilities' since it matched the scope name.  When it's not scoped,
it should be treated as an unscoped extra_spec.

Fix bug 1198941.

Change-Id: I781754ae0cb9b2a9f7e7e973f4531f2a99a98d86
Merge "Don't ignore 'capabilities' flavor extra_spec"
Merge "Fix debug message for GroupAntiAffinityFilter"
Merge "Fix aggregate update."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp