The 'intercept/attribute-release' and 'intercept/terms-of-use' flows currently share the same property, 'idp.consent.userStorageKey', and default bean 'shibboleth.consent.PrincipalConsentStorageKey' for configuring an alternative user storage key lookup strategy. Therefore, deployers can't configure a separate user storage key lookup strategy for each flow. Relevant beans in system/flows/intercept/attribute-release-beans.xml and system/flows/intercept/terms-of-use-beans.xml:
Both flows should allow the deployer to configure separate user storage key lookup strategies, e.g. via properties named 'idp.consent.attribute-release.userStorageKey' and 'idp.consent.attribute-release.userStorageKey', respectivley.
(This issue may be related to the issue
IDP-583, 'Unable to override system bean definitions'.)