Fixed jshint gating errors

Change-Id: If065b47bc42312918cb65b1f677f6bdfcfb4f709
Closes-Bug: #1359395
Merge "Fixed jshint gating errors"