Merge pull request #1 from alibuild/alibot-cleanup-12069

Please consider the following formatting changes to #12069

Author: hkoley