Merge pull request #4073 from TDT-AG/pr/20200427-luci-app-dockerman