Merge proposals dependent on lp://qastaging/~jeremywootten/pantheon-files/fix-1456202-multiple-operations-one-view

1. fix-1456202-multiple-operations-one-view
2. Dependent merge proposals