ONOS-1793  Moved trivial stores to onos-core-common/src/test; onos-core-trivial is no longer.

Change-Id: Ie4824db36e3a7eb6db3b953ee1f2786d3e22194f
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java
index 4953778..0f6ce67 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java
@@ -29,8 +29,8 @@
 import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.store.Timestamp;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
-import org.onosproject.store.trivial.impl.SystemClockTimestamp;
+import org.onosproject.store.trivial.SimpleIntentStore;
+import org.onosproject.store.trivial.SystemClockTimestamp;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;