Fast-forward from master, plus upgrade to Spring 4 and friends

This PR is based on my making changes to a fork of master as of today.

Includes:

- Upgrade to Spring 4.0.0.RELEASE
- Upgrade to Spring Security OAuth2 1.5.0.RELEASE
- Upgrade to org.apache.httpcomponents:httpclient:4.3.1
- Remove use of deprecated functionality in CloudControllerClientImpl#CloudFoundryClientHttpRequestFactory.captureDefaultReadTimeout. This method was using HttpClient.getParams, which was deprecated and removed in 4.3.x. 4.3.x and later do not support reading the default parameters for a HttpClient instance; they can only be accessed on a per-request basis (using RequestConfig). It now simply uses the fallback behavior to java.net.Socket.getSoTimeout that was there previously.