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

reintroducing use of occi_custom_location_hostname
Merge remote-tracking branch 'origin/stable/folsom' into stable/folsom