Add some flow events for funnel logging

Also track events for upload batch additions and errors seen in each
step.

Change-Id: I376e8b0a742ce69e7ff09e8de7705f6cc495ec5f
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/305
Merge "Add some flow events for funnel logging"