Redmine #6051: AIX users promises fixes

Best reviewed commit by commit.