reintroducing use of occi_custom_location_hostname
Merge pull request #31 from EGI-FCTF/stable/folsom

reintroducing use of occi_custom_location_hostname
remove ' ' in favour of '_'

As required in GFD185
Reimplement the SSH key management.

Cherry-picked from essex version.