Further downloadservice fixes
Includes all the commits in !273 (merged), fixes one regression introduced in that MR, and adds two minor code cleanups while I was in there. Will now also fix #621 (closed).
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Includes all the commits in !273 (merged), fixes one regression introduced in that MR, and adds two minor code cleanups while I was in there. Will now also fix #621 (closed).