Merge changes from topic "edi-display-feature"

* changes:
  Add EDI for WM Jetpack version and display features
  Refactor the Jetpack test utils