Added support for special case Geni Portal cert
where user bring his/her own CSR and private key to
generate their GENI Cert

Hopefully this should be it.
Merge branch 'master' of https://github.com/GENI-GEMINI/UW