CLI tool still crashing and throwing errors in 2.1.0

using the cli tool in the gitlab omnibus is still failing in version 2.1.0:

root@gitlab:~# /opt/gitlab/embedded/bin/mattermost -config="/var/opt/gitlab/mattermost/config.json" -version
panic: Failed to load system translations for 'en'
   
goroutine 1 [running]:
panic(0xb2e0c0, 0xc8201076d0)
        /usr/local/go/src/runtime/panic.go:464 +0x3e6
github.com/mattermost/platform/utils.GetTranslationsBySystemLocale(0xc8201075f3)
        /var/lib/jenkins/jobs/mattermost-platform-release/workspace/src/github.com/mattermost/platform/utils/i18n.go:44 +0x18b
github.com/mattermost/platform/utils.InitTranslations()
        /var/lib/jenkins/jobs/mattermost-platform-release/workspace/src/github.com/mattermost/platform/utils/i18n.go:29 +0x2e9
main.main()
        /var/lib/jenkins/jobs/mattermost-platform-release/workspace/src/github.com/mattermost/platform/mattermost.go:54 +0x2c

the fix mentioned here http://forum.mattermost.org/t/cli-tool-crashing-missing-translation/959/2 by @it33 nor the one mentioned by @cyball seem to have made it to the final release
the workaround downloading https://raw.githubusercontent.com/mattermost/platform/master/i18n/en.json seems to do the job, but now html templates are missing

$ /opt/gitlab/embedded/bin/mattermost -config="/var/opt/gitlab/mattermost/config.json" -version
[21:33:09 CET 2016/03/22] [INFO] (github.com/mattermost/platform/utils.GetTranslationsBySystemLocale:52) Loaded system translations for 'en' from './en.json'
[2016/03/22 21:33:09 CET] [EROR] Failed to parse server templates html/template: pattern matches no files: `./*.html`
Version: 2.1.0
Build Number: 2.1.0
Build Date: Mon Mar 14 20:45:23 UTC 2016
Build Hash: f189bc2073cf800c5f4506a69bdb51d7065269bf
Build Enterprise Ready: false