Services and Endpoints aren't syncing properly

The incremental changes weren't delivered.  This fix should work cleanly
until we solve the watch from zero transactional boundary issue.

Only the last commit is new.
Oh, got confused with another change here.  Will revert it.