Fix checkstyle buck daemon issue

- checkstyle buck daemon was not processing a file listed at end of the list.
- fix issues, which hasn't been detected due to above bug
- cosmetic fixes

Change-Id: I15f24311835726757f0974b7e5c12ff1c79a3d4e
diff --git a/bucklets/onos.bucklet b/bucklets/onos.bucklet
index 711c88f..6341896 100644
--- a/bucklets/onos.bucklet
+++ b/bucklets/onos.bucklet
@@ -196,7 +196,7 @@
   ### Checkstyle
   if do_checkstyle:
       checkstyle(
-          name = name + '-checkstyle-files',
+          name = name,
           srcs = srcs,
           jar_target = ':'+ name,
       )
@@ -287,7 +287,7 @@
       )
 
       checkstyle(
-          name = name + '-tests',
+          name = name + '-tests' + '-checkstyle',
           srcs = test_srcs,
           jar_target = ':' + name + '-tests',
       )