Expose neutron_url_timeout
Merge pull request #358 from rossella/release/roxy/master

Expose neutron_url_timeout
Merge branch 'release/roxy/master' into merge-roxy
Merge pull request #366 from vuntz/merge-roxy

Merge roxy branch into stoney