upgrade to AAP2.6#9635

bbethell-1 merged 2 commits intoredhat-cop:developmentredhat-cop/agnosticd:developmentfrom

redhat-sap:developmentredhat-sap/agnosticd:developmentCopy head branch name to clipboard