Fix bulk tracking expected responses

refs #4141
Merge branch 'master' into uitests
Try to get all tests to pass.