[Bug 838000] - lint fixes