Refactor state cache - extract inner classes
Merge branch 'develop' into feature/CLOUDIFY-1705
CLOUDIFY-1705 rename camel case. part 1
CLOUDIFY-1705 rename camel case. part 2