fix json structure as all now mandatory
Merge branch 'master' into CS_historian_front_end