Fix colliding namespaces and unused imports

Change-Id: I6298f8992a4bba6040a24662e69631b7127d1040
Signed-off-by: Tomás Villaseca <tvillaseca@whitestack.com>
4 files changed