normalize for both colon and semi-colon and merge rules for spacing/duplicates

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>