Make tomcat7 the default profile and rebase patches accordingly.
Merge remote-tracking branch 'upstream/master'
Make input streams buffered and close them after use

Several input streams were unbuffered and others were not closed
after use.

(cherry picked from commit 1cf4d85199faa172d2f8ced2341ce1e86938a2e2)

Conflicts:
	jsse/src/main/java/org/globus/gsi/jsse/GlobusSSLHelper.java
Merge pull request #116 from gbehrmann/fix/master/inputstream

Make input streams buffered and close them after use
Merge remote-tracking branch 'upstream/master'
Remove CRLF end-of-line (again)
ssl-proxy: do not check for file updated on each request

do not stress file system, if possible.
ssl-proxy:  DRY cleanup
ssl-proxy:  make cert cache life time configurable

merge configs for CRL and cert cache into a single one.
Introduced new property 'org.globus.jglobus.cert.cache.lifetime'
which controls CRL cache and cert cache.

For backward compatibility, the value of org.globus.jglobus.crl.cache.lifetime
will be taken for CRL if defined.
Fix NPE.
Fix regexp throwing invalid exscape character on windows.
Merge pull request #120 from romainreuillon/NPE

Fix a NPE
Merge pull request #121 from romainreuillon/windows

Fix for Windows
Merge pull request #111 from ellert/master

Make tomcat7 the default profile and rebase patches accordingly.
Reload the different stores every hours

(cherry picked from commit a40bf751acd69f20cad661eb37a7d0420d880a31)
(cherry picked from commit 91217bf8e67c17f545dea659fd7af903384b931d)
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
gridftp: Propagate FTP failure reply in client
Merge pull request #125 from gbehrmann/feature/ftp-client-propagate-reply

gridftp: Propagate FTP failure reply in client
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	jsse/src/main/java/org/globus/gsi/jsse/GlobusSSLHelper.java
	ssl-proxies/src/main/java/org/globus/gsi/stores/ResourceTrustAnchor.java
	ssl-proxies/src/main/java/org/globus/util/GlobusPathMatchingResourcePatternResolver.java
Fix tests