Merge "Fix test by waiting to lbaas entity delete"