BZ-12892: js format
Merge remote-tracking branch 'origin/RC20140821' into integration