Merge branch convert_h5_to_tf with refs/heads/master into refs/merge-requests/235/train

27 jobs for !235 with convert_h5_to_tf into master in 14 minutes and 56 seconds (queued for 1 second)
merge train