ISIS-546: oid marshalled can contain '@' in username
ISIS-477: upgrading DN to core 3.2.7 etc