Update lint config to enforce braces for single line statements

Depends on PRs:
#4505
#4507
#4508