Merge "Add Airship v1beta1 jobs"

diff --cc jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
Simple merge

diff --cc jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
Simple merge

diff --cc jjb/airship/job_feature_tests_centos.yml
Simple merge

diff --cc jjb/airship/job_feature_tests_ubuntu.yml
Simple merge

diff --cc jjb/airship/job_feature_tests_upgrade_ubuntu.yml
Simple merge

diff --cc jjb/airship/projects.yml
Simple merge