Hi Daan, Please cherry-pick following commit for fixing CLOUDSTACK-3540:
commit 46f2b61374c2012bca251c1de58fb1250e50b755 Author: Sheng Yang <sheng.y...@citrix.com> Date: Fri Jun 27 17:16:56 2014 -0700 CLOUDSTACK-3540: Fix edithosts.sh on matching tag Thank you! --Sheng