Fix jsHint errors
Merge branch 'fix_jshint' into cloud_service