SOLR-1427: redo of Grant's previous commit that yonik rolled back - but this time with the registration postponed until the latch is released