Add 'buildout_dir' environment variable.
Use uppercase BUILDOUT_DIR var.
Merge remote-tracking branch 'upstream/master'