Update control.sh to match the no-rename deploy style.
Merge pull request #77 from VictorLowther/pull-req-release-betty-master-fd994cdc70

Stop renaming nodes as part of initial node discovery. [2/3]
Merge pull request #79 from ninja-cat/quickfix

Quick fix for /etc/init.d/nfs-kernel-server file permissions
Merge branch 'aabes/v2.1.1-hadoop-dell' into HEAD
Merge branch 'release/betty/master' into release/fred/master

Conflicts:
	updates/control.sh
Merge branch 'release/hadoop-2.1/master' into release/fred/master