Partially reverting Change-Id: Ic3a2f13c14816e803debc208826445ef27b49a4f

Calls to .build() and addLocalPackages() were breaking WARs.

Also, forcing onos-buck to check SHA of downloaded bits rather than just Buck's version

Change-Id: I2e93ffaec7eb08ace3742b8f5456516836e149e2
diff --git a/tools/build/buck-plugin/buck-plugin-test b/tools/build/buck-plugin/buck-plugin-test
index 41ddf31..cb8fd76 100755
--- a/tools/build/buck-plugin/buck-plugin-test
+++ b/tools/build/buck-plugin/buck-plugin-test
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-NO_BUCKD=1 buck build //apps/dhcp/app:onos-apps-dhcp-app --no-cache --show-output
+NO_BUCKD=1 onos-buck build //apps/dhcp/app:onos-apps-dhcp-app --no-cache --show-output