fixed merge issues for 1.11.2 release

Change-Id: I85844eeda3be77ad922583c9d8c74e031231ded7
2 files changed
tree: d9d12262733de73f45c7baed464f410596e22df8
  1. data/
  2. features/
  3. plugins/
  4. tests/
  5. .gitignore
  6. .gitreview