Move "sync" commands out of Diagnostics and fix them

This mirrors the layout on the server side.

I don't consider this a breaking change, as the existing sync commands were broken
to begin with.

Change-Id: Id80e148e2a0218d6bd64673bb09c15ab0d98418b
Add touch-domain to CLI

Change-Id: I369051e7d7ba2c0819835dada3a13e54798a63ad