Merge "Set prometheus monitoring for feature tests"

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/job_master_feature_tests_centos.yml
Simple merge

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

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