Fixes #4142: /etc/hosts gets messed up by sed commands
Merge pull request #7 from peckpeck/bug_4142/etc_hosts_gets_messed_up_by_sed_commands

Fixes #4142: /etc/hosts gets messed up by sed commands
Fixes #5914: Implement #5130: add a script to check box url
Merge pull request #8 from peckpeck/bug_5914/implement_5130_add_a_script_to_check_box_url

Fixes #5914: Implement #5130: add a script to check box url
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/3.0'

Conflicts:
	provision/node_centos6.sh
	provision/server_centos6.sh
Add 3.0 support
Add 3.0 support in 2.11
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Add 3.0 support
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0
Merge branch 'branches/rudder/3.0'