Tests to cover possible conflicts between branch/tag create/delete

Additional test cases to cover scenarios where we create/delete branches that may conflict with tags of the same name, and visa-versa.

Fixes #3218