Fix Composite Javascript for WebKit

Change-Id: I5da656305be57dd9d8e78c6f498daecdab2120f8
Merge topic 'catalyst-web-composite' into master

8f3a3574 Fix Composite Javascript for WebKit