Remove locals() from various places.

fixes bug 1171936

Remove usage of locals() for string formatting

Change-Id: Ib05538095086ddefdb486c84da506af662ec5c9b
Send updated aggregate to compute on add/rm host

The XenAPI driver relies on getting an up-to-date version of the
aggregate during add_host_to_aggregate and remove_host_from_aggregate
This change ensures that happens.

Fixes bug 1161619
Change-Id: I764e1fc3b9ff20b6eda8f6ec00849f2164de0a49
Merge "Send updated aggregate to compute on add/rm host"
Merge "Remove locals() from various places."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp