Merge "Increase gabbi API test retry time"