reuse same instance of webjarUriLocator
Merge branch 'emberUpdate' into 1.6.x