Add support for js coming from admin as well as open admin
fix jetty duplicate fragment error
Merge remote-tracking branch 'upstream/admin3' into develop