Adds scan merge unit tests for disabled merging.
Merge commit 'e452111427d7b593e55637c3c62471f869b23415' into HEAD