Merge "New JJB files for test_automation project"