Merge branch 'bk/submodule-in-recursive-merge'

* bk/submodule-in-recursive-merge: submodule: Search for merges only at end of recursive merge submodule: Demonstrate known breakage during recursive merge