Added check for skipping integrity check.  Improved logic around
handling record type name conflicts when loading RT names for existing
orgs