finished refactoring cinder states.
Merge branch 'dev-cinder' into develop