Merge js_coding_style_fixes to master