Bug 1699 - Fix redefinition of uInt by replacing 2nd def with inclusion of 1st. Also fixed numerous other over qualification of method name and token pasting issues which cause GCCE errors.

<?xml version="1.0" encoding="UTF-8"?>
<relnotes name="HWRM UI Plugin">
  <purpose>
    Hardware Resources Manager UI Plugin
  </purpose>
</relnotes>