Merge "Move Octavia tests to scenario tests"