Add test cases for bgfetch/conflict resolution withMeta commands

Change-Id: I298f8827269b1918fb1eb1a421a4fefac68fa7ec