update from base#1

Merged

patrickomeara merged 8 commits intomaintainlyhq:masterfrom

docker-library:master

Aug 9, 2016

Commits on Jul 29, 2016

Commits on Aug 1, 2016

Commits on Aug 2, 2016

Convert explicit "export A=B" lines of Apache's envvars file into "${A:=B}" such that we can override them at runtime easily
tianon
committed

Commits on Aug 8, 2016