Fixeup menu order a little

Change-Id: Ibd7cc61c03f85d624d7640ef64d1021b36bc469c
Unnecessary dependencies has been removed from json-impl's pom.
Merge branch 'release/3.1.0' into develop