OZP-10: increase timeout for r.js
Merge branch 'master' into feature/ozp-10-dashboard