Incorporating JSHint errors

Reviewed by:
Testing:
Tickets:
Backport: