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/tools/build/conf/src/main/resources/onos/checkstyle.xml b/tools/build/conf/src/main/resources/onos/checkstyle.xml
index 1d365a9..9b98d01 100644
--- a/tools/build/conf/src/main/resources/onos/checkstyle.xml
+++ b/tools/build/conf/src/main/resources/onos/checkstyle.xml
@@ -139,9 +139,9 @@
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
             <property name="scope" value="package"/>
-	    <property name="allowMissingJavadoc" value="true"/>
+            <property name="allowMissingJavadoc" value="true"/>
             <property name="allowUndeclaredRTE" value="true"/>
-	    <property name="suppressLoadErrors" value="true"/>
+            <property name="suppressLoadErrors" value="true"/>
         </module>
         <module name="JavadocType">
             <property name="severity" value="warning"/>