Updated openstack/openstack
Project: openstack-dev/devstack  a35bd8b70f70fda7b184a117106332aff10ff66a
null
Enable marconi-server to run when USE_SCREEN=false

This patch,
1. adds log_file option to marconi.conf
2. redirects the output from marconi-server, in the same precedent
set by another project.

Change-Id: Ib273a03625d5a4edf8bb3ed7d522d2b087975acd
Updated openstack/openstack
Project: openstack/neutron  fe43624a2512a7290482446229bbe892374e3e7e
null
Updated from global requirements

Change-Id: I40115d573e0f5dbfde9641a5f797e2aa7af254a3