Merge pull request #2 from alibuild/alibot-cleanup-11119

Please consider the following formatting changes to #11119

Author: abmodak