Merge "Update path to easymock" into idea133
automerge: a8820ae

* commit 'a8820ae52a31cb2a96fc7fd3fc6e6df440584cda':
  Update path to easymock