Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix the junit test tag

Change-Id: Idc4c07fba8786f0a0eea63c51a39063fdbe76f31