Restore throttling of touch and fix ES specs
This is version 2 of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3747 as it was brought up the spec behaviour was wrong and we should adjust that, instead of further adjusting our touch code.
Once green this should be merged into both master and the 10.3 stable branch.
Edited by Yorick Peterse