XD-705 the registrar.xml is now job-module-beans.xml.
Also updated code based on code review comments.