Small tweak to changes

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed testcase due to changes made in upstream.

Signed-off-by: crynobone <crynobone@gmail.com>
Tweak ant build.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'