Merge "Add signal_transport in software deployment resource" into stable/colorado

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml
Simple merge

diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml
Simple merge