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
Check if VNC is enabled before requesting the VNC console.

Fixes #29
Merge pull request #39 from alvarolopez/stable/folsom

Check if VNC is enabled before requesting the VNC console.
Fix term names according to specification.

Closes #38
Import the vnc_enabled option into our FLAGS object.
Fix term names according to specification.

Closes #38
Merge pull request #41 from alvarolopez/fix_vnc

Import the vnc_enabled option into our FLAGS object.
Merge pull request #40 from alvarolopez/stable/folsom

Fix term names according to specification.
Fix term names according to specification.

Since now the images, flavor and secgroups categories and links are
based on the ID, we have to adapt all the code to reflect this change.

Closes #38
Ensure that the appended categories does in fact exist.

Closes #43
Merge branch 'bug/43'.