Rebase onto outrigger/keel#37

grayside wants to merge 3 commits intomasterphase2/docker-build:masterfrom

task/leverage-keelphase2/docker-build:task/leverage-keelCopy head branch name to clipboard