Issue #1951722 by ceardach: Updates mapping admin form ajax callbacks for cleanup and to allow testing; allows Master record type to be used if custom record types are defined