Java cleanup, make package name match folder name

Change-Id: I8807ce7a6f5a115570d61a2a8c216d817d0334be

testtools/qa/cli/CLITest.java

@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-package clitest;
+package cli;
 
 
 import complexlib.ComplexTestCase;

testtools/qa/cli/makefile.mk

@@ -19,7 +19,7 @@
 PRJ := ..$/..
 PRJNAME := testtools
 TARGET := test_cli
-PACKAGE = clitest
+PACKAGE = cli
 
 .INCLUDE: settings.mk
 

testtools/qa/cliversioning/VersionTestCase.java

@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-package cliversion;
+package cliversioning;
 
 
 import complexlib.ComplexTestCase;

testtools/qa/cliversioning/makefile.mk

@@ -31,7 +31,7 @@
 PRJ = ..$/..
 PRJNAME = cli_ure
 TARGET := qa_test_climaker
-PACKAGE = cliversion
+PACKAGE = cliversioning
 
 .INCLUDE: settings.mk