Fix studio parsing issue, ENG-4711, r=stefano
Merge branch 'master' of github.com:VoltDB/voltdb