Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index a37d1e8..9cc5898 100644
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -47,8 +47,7 @@
 
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<artifactId>mockito-core</artifactId>
 			<scope>compile</scope>
 		</dependency>