Merge proposals dependent on lp:~derek-name/openvista-gtm-integration/bug818549-openvista-replication

1. bug818549-openvista-replication
2. Dependent merge proposals