Use buck for tests

- use buck instead of maven
- cleanup output when building cluster.json file
- swap the correct nodes in swap nodes test

(cherry picked from commit 4b66b32e5057d84175195a9c5a823e59cb66fa67)

Change-Id: If5981567115fd3acdc353f4a2ee620f5e0a29716
diff --git a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
index 8937a4a..29a40aa 100644
--- a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
+++ b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
@@ -116,7 +116,7 @@
 
         main.step( "Create ONOS package" )
         if onosPackage == 'on':
-            packageResult = main.ONOSbench.onosPackage()
+            packageResult = main.ONOSbench.buckBuild()
         else:
             packageResult = main.TRUE
             main.log.info( "Skipped onos package as it is disabled in params file" )