Merge "Fix floating ip timeout issues with uwsgi enabled"