BUG-731: fix unused imports

Performs just regular maintenance to get rid of warnings.

Change-Id: Icdaf65e6d92ebb3423187f012c3e931428db092c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-731: fix unused imports"