Merge "Airship remove tests for nordix repos and change defaults"