1039913: rhsm-debug updates and fixes