lint
Merge pull request #718 from Yangqing/dev

More namespace cleaning.
Merge commit '87027469dd9f07b15a54a0c96b2280d4a95fef84' into dev