Preparing Easymock for a future upgrade.#5510

sduskis merged 3 commits intogoogleapis:mastergoogleapis/google-cloud-java:masterfrom

sduskis:upgrade_easymocksduskis/gcloud-java:upgrade_easymockCopy head branch name to clipboard