Fix for HM problems with nosql and bigdata machines, which was caused by hosname change