merge swimsuit_tan into one-piece_tan

BUR #4384 has been approved by @evazion.

rename swimsuit_tan -> one-piece_tan

Seems people didn't know the right tag is one-piece tan. An alias would be a bad idea since bikini are swimsuits too.

The bulk update request #4384 (forum #178637) has been approved by @evazion.