XD-705 Merged 733 changes

The registrar now uses XD-734 infrastructure vs the original XD-205.