fixing issues with discovering and heatclient
Merge pull request #109 from Mirantis/fix/discovering

fixing issues with discovering and heatclient