Give wbclient.watchlist some love (jshint + code style)

Change-Id: I62367f7e770142f869e8119c8554af7db0e1d079
Merge "Give wbclient.watchlist some love (jshint + code style)"