Merge branch 'snf_openstack_v2.0' into kk_working
Merge branch 'snf_openstack_v2.0' into kk_working
Merge branch 'snf_getIpAddress' into kk_working
Import a missing class