INT-1362-2: Reset RequestContextHolder in Tests

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