Merge branch 'master' of github.com:huit/nepho into feature/openstack-havana
Merge branch 'feature/openstack-havana' of github.com:huit/nepho into lotsa-changes