BUG fixes.

BUG-1627: Hosts are cleaned by hosttracker.
BUG-1754: Implemented a clusterAware mechanism for hosttracker.

Change-Id: I56a7b1fada563aaf9d423c2cfed7c8dff0c9dac3
Signed-off-by: André Martins <aanm90@gmail.com>