1186 tag merge creates duplicates

[Taeir]

Depends on #1185

First replacement query is altered to not alter posts that have both the primary tag and subordinate tag. Second replacement query removes the subordinate tag from posts that still have it (those not affected by the first query).

Fixes #1186