Ensure right brace on the same line as the next token

To be merged first:

- [ ] https://github.com/zanata/zanata-client/pull/38
- [ ] https://github.com/zanata/zanata-server/pull/647