Resolving terrible conflict in tag editor.
EUCA-7344
Merge branch 'tagsbroke' into testing