Remove deprecated comments since username tag got CDATA
(cherry picked from commit 1dcaf2d816721704bfb05ae2587c09e37c873e71)
Remove deprecated comments since username tag got CDATA
(cherry picked from commit 1dcaf2d816721704bfb05ae2587c09e37c873e71)