Revert "replaced deprecated wfMsg* with wfMessage also changed DM edit button from div to span"

This reverts commit 4859a225fc95bed7c24c1cef65c79ba5a951f1a1

Change-Id: If59c2c6377234b2893520582d9d61fe94aad96ac