Run ExecutionTest w/integration test framework

I changed the default local.xml to use 2 NCs with
2 partitions each like AsterixHyracksIntegrationUtil
so that the results will match despite using simple
string compare to determine correctness.

There is also one test in particular (big-object-join)
that I had to add an artificial order by clause to
to deal with different results.

Issues outstanding:
- HDFS in ClusterExecutionIT needs to be thought out

Change-Id: I423f2a7c77839b999d466dd5cace302574d956c0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/525
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Chris Hillery <ceej@lambda.nu>
diff --git a/asterix-app/src/test/resources/dapd/q2.aql b/asterix-app/src/test/resources/dapd/q2.aql
index 0d2795c..464bf8b 100644
--- a/asterix-app/src/test/resources/dapd/q2.aql
+++ b/asterix-app/src/test/resources/dapd/q2.aql
@@ -46,11 +46,11 @@
   latlong: point
 }
 
-declare nodegroup group1 on nc1;
+declare nodegroup group1 on asterix_nc1;
 
 /*
 declare dataset Event(EventType) 
-  splits nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
+  splits asterix_nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
 */
 
 drop dataset Event;
@@ -59,9 +59,9 @@
 
 load dataset Event 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
+(("path"="asterix_nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
 
-write output to nc1:"/tmp/dapd_q2.adm";
+write output to asterix_nc1:"/tmp/dapd_q2.adm";
 
 for $event in dataset('Event')
 for $sponsor in $event.sponsoring_sigs