Merge branch 'master' into develop
add cinder service
Merge branch 'develop'