Duplicate configuration services (regression of OAK-1476)

chetanm, i just was trying to fix an issue with the token configuration options and found that in the OSGI setup the token and principal configuration service is present twice. i think this is caused by the changes you made for OAK-1476 introduced a regression with the principal and token configuration, namely the following lines:

[...]
compositePrincipalConfiguration.addConfiguration(new PrincipalConfigurationImpl(this));
[...]
compositeTokenConfiguration.addConfiguration(new TokenConfigurationImpl(this));

wdyt?