Remove unused imports

This fixes warnings stemming from unused imports.

Change-Id: I7e91ca9fdde55f19d0463c9f662ca96f8270c87d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Migrade JUnitMatchers references

With JUnit 4.11 JUnitMatchers.containsString() has been deprecated in
favor of org.hamcrest.CoreMatchers.containsString(). Same goes for
hasItem().

Change-Id: Ie11616588b126110579e92bfb4b72de022bf211c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Remove unused imports"
Merge "Migrade JUnitMatchers references"