tree cff2976e3f7019249ce2379a45c48e199ae1738a
parent 8402a6f1cca2c4f738701226ce594c42f7da2eb3
parent 865e1bdbeff6ac2e150c0540f3f87170bf4a3ca0
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1483475137 -0500
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1483478259 -0500

Merge branch 'stable-2.13'

* stable-2.13:
  Replace EasyMock with Mockito

Change-Id: I28fae8d964fca37580f6779b6b3819688eecd4ff