Fixed compilation issue -> RestTest imports
Merge remote-tracking branch 'origin/master' into master-fix2009