code cleanup
remove jsl config file and the doc line about it
partly revert 7be996c
final style edits
Merge pull request #2965 from Nami-Doc/style-cleanup1

Style cleanup
rebuild for some unneccessary parentheses changes

rebuild of 3921e3db34edc8f04f663245f9411ce2690e2344
Merge remote-tracking branch 'refs/remotes/upstream/master'