INT-3145: Fix compatibility with SPR 4.0

JIRA: https://jira.springsource.org/browse/INT-3145