Merge branch 'ibm-changes' into 'master'

ibm-changes

See merge request !16

(cherry picked from commit bd4f28a0)

8bd46ad3 ibm-changes
40f008fb Update set_airflow_env.sh
4 jobs for cherry-pick-bd4f28a0 in 9 minutes and 43 seconds (queued for 1 second)