I have so made a hash out of this merge from the chrism-clockserver-merge branch.  I have no idea what I'm doing, clearly.  But this checkin gets us to the place I intended originally.