Merge "Allow run-ravenwood-tests.sh to use atest-dev" into main