make merge conflict changes black

instead of using the red dot to be all fails, use a black dot to
represent a change which has a merge conflict. Then it's clearer
when something it off the subway map, why it is, without having
to mouse over the circle (which few people knew about).

Change-Id: Ia44292fa553538e8924993f92a7177dfae34111f
clean up possible js incompatibilities

clean up added commas and missing semicolons which generate
warnings in js2-mode because they could lead to browser issues.

Change-Id: Iebbfa54b13a3db0de477904457c7ede57dd233d4
Merge "make merge conflict changes black"
Merge "clean up possible js incompatibilities"