INT-2908 Fix concurrency around timeouts property

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