After merge, rematch preset and update tags if necessary (closes #3851)
After merge, rematch preset and update tags if necessary
(closes #3851)

kartta-labs/iD,mapmeld/iD,ngageoint/hootenanny-ui,edpop/iD,digidem/iD,kartta-labs/iD,openstreetmap/iD,mapmeld/iD,mapmeld/iD,openstreetmap/iD,bagage/iD,AndreasHae/iD,kartta-labs/iD,1ec5/iD,openstreetmap/iD,edpop/iD,AndreasHae/iD,digidem/iD,morray/iD,ngageoint/hootenanny-ui,ngageoint/hootenanny-ui,edpop/iD,morray/iD,1ec5/iD,bagage/iD,1ec5/iD,bagage/iD,AndreasHae/iD