CAS-1466: Initial commit dependency on httpcomponents
CAS-1466: apache httpcomp w/ custom proxy authn truststore
Merge branch 'master' into CAS-1466
CAS-1466: custom truststore for proxy authn
CAS-1466: custom truststore for proxy authn
CAS-1466: custom truststore for proxy authn
CAS-1466: custom truststore for proxy authn
Merge branch 'master' into CAS-1466

Conflicts:
	cas-server-core/src/test/java/org/jasig/cas/ticket/proxy/support/Cas20ProxyHandlerTests.java
	cas-server-core/src/test/java/org/jasig/cas/util/SimpleHttpClientTests.java
CAS-1466: custom truststore for proxy authn
CAS-1466: custom truststore for proxy authn
CAS-1466: custom truststore for proxy authn
Merge branch 'master' into CAS-1466

Conflicts:
	cas-server-core/src/main/java/org/jasig/cas/logout/LogoutManagerImpl.java
	cas-server-core/src/main/java/org/jasig/cas/util/HttpMessage.java
	cas-server-core/src/test/java/org/jasig/cas/logout/LogoutManagerImplTests.java
Fixed javadoc failure and CS issues
Merge pull request #601 from Unicon/CAS-1466

CAS-1466: Local truststore for proxy authentication
Deleted misnamed test file
Fixed misnamed props for truststore socketfactory.
Added template props for truststore settings
Merge branch 'master' into saml-attr-relp
commented out view decls.