checkstyle arrangement
fix domain nameserver test blank space
Merge remote-tracking branch 'origin/dev' into dev
Merge pull request #347 from wade1012/dev

Dev Wade