Merge "Fix for manila API bind address"