Merge CacheMarkdownField to EE

This branch merges http://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6095 into gitlab-ee, fixing merge conflicts.

It also merges a lot of unrelated commits in, as the MR was ahead of EE's current master.

See merge request !789