Renames master mention to main in ipa building jobs. Changes m3-dev-tools trigger phrases
accordingly and some minor improvements

Change-Id: Ic453b485fc5f7a58e0c629e394f383fb0299bb6a
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 1aaa7c7..ef6530e 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -38,7 +38,7 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
-    - openstack_ipa_and_ironic_image_building
+    - main_openstack_ipa_and_ironic_image_building
     - metal3_ipa_and_ironic_image_building_test
     - metal3_dev_tools_integration_test_centos
     - metal3_dev_tools_integration_test_ubuntu