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
provisioner using info provided by deployer (after node discovered) rather than compute it's own boot_ip_hex value in chef (can't write it out to the node after the fact... cross node posting is badness)
provisioner using info provided by deployer (after node discovered) rather than compute it's own boot_ip_hex value in chef (can't write it out to the node after the fact... cross node posting is badness)
admin_data_net info is required for dhcp
Merge branch 'v2.1.1-hadoop-dell' into release/fred/master
Merge branch 'aabes/v2.1.1-hadoop-dell' into HEAD
Merge pull request #97 from aabes/pull-req-release-fred-master-9c00ea1eb8047c2defe53ea521ed4c8b1c2fb263

Merged by devtool for VictorLowther
Merge branch 'release/betty/master' into release/fred/master

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