Backport issue board milestone lists EE changes
Picks changes on https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6615/ to make CE > EE merge smoother.
Picks changes on https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6615/ to make CE > EE merge smoother.