INT-2720: UriTemplate support for S-WS transports

Remove deprecation in the WS module

JIRA: https://jira.springsource.org/browse/INT-2720
https://jira.springsource.org/browse/INT-2530
INT-2720: Polishing after rebase