Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/noelbk/devstack
allowed q-agt to configure logging in neutron.config with Q_AGENT_EXTRA_DEFAULT_OPTS and mvrp with Q_AGENT_EXTRA_AGENT_OPTS