Merge proposals dependent on lp://staging/~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part2

1. fix-1604300-merge-find-functionalities-part2
2. Dependent merge proposals