Fix Bug 1421857 - fix test-merges regression to un-bust pine
Fix Bug 1421857 - fix test-merges regression to un-bust pine

sarracini/activity-stream,Mardak/activity-stream,sarracini/activity-stream,mozilla/activity-stream,mozilla/activity-stream,Mardak/activity-stream,rlr/activity-streams,rlr/activity-streams,AdamHillier/activity-stream,Mardak/activity-stream,rlr/activity-streams,rlr/activity-streams,AdamHillier/activity-stream,Mardak/activity-stream,AdamHillier/activity-stream,AdamHillier/activity-stream,mozilla/activity-streams,mozilla/activity-stream,mozilla/activity-streams,sarracini/activity-stream,sarracini/activity-stream,mozilla/activity-stream