New upstream
Fix bug LBAAS-302