checkstyle arrangement
fix domain nameserver test blank space
Merge remote-tracking branch 'origin/dev' into dev