change rdapController Test json To rdap+json
Merge commit 'd07a6873568dbfcac64ff02058472e93c9389757' into dev
just reback
Merge pull request #350 from wade1012/dev

Dev Wade
update war
Merge pull request #351 from forumbyr/master

update war
Merge pull request #352 from cnnic/dev

Dev