Merge from CVS

- Handle empty key_block in gss_import_sec_context()
- process GLOBUS_GFS_EXTRA_CA_CERTS
Merge changes from CVS

- Enable adding in memory CA cert to cert store
- GT-489: xio_gsi errors with OpenSSL 1.0.1e