client checkstyle
Merge pull request #2892 from sancar/client/checkstyle

client checkstyle follow up to #2807