Merge pull request #234 from Mirantis/ocata

Ocata compatability