Backport of PR 47808 to 2018.3, improved grains support for AIX
Backport of PR 47808 to 2018.3, improved grains support for AIX

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