Bug 1082325 - upgraded mock package from java 1.6 to java 1.7. r=mgervasini