Fix jsHint errors
Merge branch 'dev' into service_bus