syncing cob-master with master again

including fixes for the update h5py package

added 4 commits

• 70559e66 - SW-933: Clear multiTasks list on OK close and showMultiEdit
• 38bcc4d3 - SW-933: Change spaces into a tab
• 5e91f0e6 - SW-933: Merge branch 'master' into SW-933
• 0e58647a - Merge branch 'SW-933' into 'master'

Compare with previous version

added 8 commits

• ffbf801c - TMSS-309
• d4efefd9 - TMSS-309
• ec2ecdd7 - Merge branch 'master' into TMSS-309
• 54423728 - Ignored debug.log file
• f31e6f73 - Merge branch 'master' into TMSS-309
• a69ea20f - Merge branch 'master' into TMSS-309
• 1e2ed56c - TMSS-309: Issue in loading timeline on date selection in Firefox is fixed
• 616f5c81 - Merge branch 'TMSS-309' into 'master'

Compare with previous version

added 6 commits

• 3f8ec215 - TMSS-318: Added JSON schemas for ingest tasks & subtasks
• 8468d86a - TMSS-318: removed barrier, as we may move that to the SU task table as a more generic solution.
• 06703b6f - Merge remote-tracking branch 'origin/TMSS-318-input' into TMSS-318
• a814e92c - TMSS-318: add ingest tasks and subtasks, handling and tests
• e21be007 - Merge remote-tracking branch 'origin/master' into TMSS-318
• d0ab7097 - Merge branch 'TMSS-318' into 'master'

Compare with previous version

added 4 commits

• 3868c7d3 - TMSS-337 Remove 'default' value in SchedulingUnitBlueprint and add...
• e0fb898e - TMSS-337 Add testcase for checking relative_start/stop_time and...
• 0842b27f - Merge branch 'master' into TMSS-337
• 67d7543c - Merge branch 'TMSS-337' into 'master'

Compare with previous version

merged

mentioned in commit eadebef3