Checkstyle fixes before 1.1.8 release round.

Change-Id: I675fda5d0d0de3155d1ddddc68e204b81f468142
Reviewed-on: http://review.couchbase.org/27309
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Reviewed-by: Deepti Dawar <deepti.dawar@globallogic.com>