Merge branch 'stable-2.9'

* stable-2.9:
  Fix JS resource loading for JsPlugin type (was returning 404)

Change-Id: Ia403a7faf97ab6fe167eaf08ebc71cb0ba758807