WPP-70: [master]Adding Socket Timeout

- Refactoring Connection Timeout
- Refactoring to allow Shib impl HttpClient to leverage both timeouts
- Updated Rich Config jsp