SERVER-14412: fix some collection intent issues