align with legacy-naming update, cleanup, add proper handling of principal/credential, update xslt for tests to support v1.6 of config