Backport #38779 to 2016.11 (#39089)
Backport #38779 to 2016.11 (#39089)

* ignore ADMX/ADML files with syntax errors

* narrow except for XML Syntax Error on admx file

* attempt to remove any "encoding='unicode'" from ADMX/ADML files if lxml does not support the encoding

* lint fixes

* fix bonehead typo

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt