shixiong/okd @ a069be8c5c54ff1661baa992d3f0e89afd6c92b6

Scott Dodson fea08b9ba2 Merge pull request #2007 from bachp/lowercase-proxy-vars		%!s(int64=9) %!d(string=hai) anos
..
meta	2c608429d8 Bug 1320829 - Ensure docker installed for facts	%!s(int64=9) %!d(string=hai) anos
tasks	e7bba72cd9 Add flag to manage htpasswd, or not.	%!s(int64=9) %!d(string=hai) anos
vars	2d015f6197 Add lower case proxy variables	%!s(int64=9) %!d(string=hai) anos