Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix the junit test tag

Change-Id: Idc4c07fba8786f0a0eea63c51a39063fdbe76f31
tree: 5580164f25dc07f558005b626a0f0e9989138f2b
  1. .settings/
  2. src/
  3. .gitignore
  4. BUILD
  5. LICENSE