Update green to pass 4.5:1#30972

ffoodd wants to merge 2 commits intomaintwbs/bootstrap:mainfrom

master-fod-green-updatetwbs/bootstrap:master-fod-green-updateCopy head branch name to clipboard