Rebasing the things
Merge branch 'identity' of github.com:rcbops-qa/cloudcafe into identity