Merge pull request #5520 from acooler15/luci-lib-docker