updt openvanilla for new caveats DSL
Merge pull request #2506 from rolandwalker/openvanilla_caveats

updt openvanilla for new caveats DSL