"Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005 fix, which touches the files in their old locations.
Nick Mathewson