Fix eid and dtm being incorrectly added to screen_view and timing context (fixes snowplow#161)

Author: jbeemster

src/main/java/com/snowplowanalytics/snowplow/tracker/events/ScreenView.java

@@ -83,9 +83,9 @@ protected ScreenView(Builder<?> builder) {
      */
     public TrackerPayload getPayload() {
         TrackerPayload payload = new TrackerPayload();
-        payload.add(Parameter.SV_NAME, this.name);
         payload.add(Parameter.SV_ID, this.id);
-        return putDefaultParams(payload);
+        payload.add(Parameter.SV_NAME, this.name);
+        return payload;
     }
 
     /**

src/main/java/com/snowplowanalytics/snowplow/tracker/events/Timing.java

@@ -112,10 +112,10 @@ protected Timing(Builder<?> builder) {
     public TrackerPayload getPayload() {
         TrackerPayload payload = new TrackerPayload();
         payload.add(Parameter.UT_CATEGORY, this.category);
-        payload.add(Parameter.UT_VARIABLE, this.variable);
-        payload.add(Parameter.UT_TIMING, Integer.toString(this.timing));
         payload.add(Parameter.UT_LABEL, this.label);
-        return putDefaultParams(payload);
+        payload.add(Parameter.UT_TIMING, Integer.toString(this.timing));
+        payload.add(Parameter.UT_VARIABLE, this.variable);
+        return payload;
     }
 
     /**