Minor code changes
Merge branch 'stable/folsom' of github.com:tmetsch/occi-os into stable/essex
Minor code changes
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.
Merge pull request #35 from alvarolopez/stable/folsom

Reimplement the SSH key management.
quote category terms and encode location urls
Merge pull request #36 from EGI-FCTF/stable/folsom_rocci

quote category terms and encode location urls