merge managed-zk-client, also fix trunk test, and disable topo migration [r=fwereade]
juju now uses the txzookeeper.managed Client which automatically restablishes sessions recreating presence nodes and triggering extant watches.
This also fixes some subordinte changes, namely a broken lxc test, and disables the transparent topology migration as without accompanying code changes to running agents it will cause problems.