a few syntax glitch fixes
Merge branch 'master' of github.com:canfar/openstack-sandbox