Merge "Backport of some fixes made on Capella (Polarsys Bugzilla):"
tree: 1a669f96a331f9113973b15260d6ad20ee2991ea
  1. features/
  2. plugins/
  3. releng/
  4. tests/
  5. .gitignore