CLC-4650 - Fixed JSHint failures