[HELIX-430] Fix test failures caused by restlet 2.2
Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x