almost there.  Few things left and then time to release 4.3

Change-Id: I4b5e0a922cbb5a37e5565342b9101223c298ed5f