A more extensive reconcile

Change-Id: Ifd869a6c77e982dd4f549624d996cd1bf5a681a3
Shhhhh!  Revert some Verbose logging from reconcile

Change-Id: Ia569e41bd8e00dab958e70817cd28753793078d9