[MONDRIAN-1572] clear out the entire context during many to many tuple
resolution.
conf builds changed
Merge branch 'evergreen' of https://github.com/wgorman/mondrian into evergreen