Merge branch 'no_php' into SPARK-3454

Author: squito

core/src/test/resources/HistoryServerExpectations/applications/json_expectation renamed to core/src/test/resources/HistoryServerExpectations/application_list_json_expectation.json

@@ -1,9 +1,9 @@
 [ {
-  "id" : "local-1427397477963",
+  "id" : "local-1430917381534",
   "name" : "Spark shell",
   "attempts" : [ {
-    "startTime" : "2015-03-26T19:17:57.184GMT",
-    "endTime" : "2015-03-26T19:20:02.949GMT",
+    "startTime" : "2015-05-06T13:03:00.893GMT",
+    "endTime" : "2015-05-06T13:03:11.398GMT",
     "sparkUser" : "irashid",
     "completed" : true
   } ]