SAK-23287 fix for failure to build the tests in java 7
Patch from Charles H (Unicon), tweaks by AZ



git-svn-id: https://source.sakaiproject.org/svn/search/trunk@120476 66ffb92e-73f9-0310-93c1-f5514f145a0a