Merge branch '246_fix_dataformat_list_for_protocol_templates' into 'master'

Fix dataformat list for protocol templates

See merge request !146
5 jobs for master in 28 minutes and 19 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #205923
docker
build_linux_36

00:12:01

91.0%
passed #205924
docker
build_linux_37

00:11:32

91.0%
passed #205921
macosx
build_macosx_36

00:26:52

91.0%
passed #205922
macosx
build_macosx_37

00:26:05

91.0%
 
  Deploy
passed #205925
docker
deploy_beta

00:01:26