Eng 4291 misc -- 2 minor cleanup commits on top of ENG-4291-ddlxml