Disable ipv6 router advertisement by default and add optional variable to enable. Bug at https://bugs.launchpad.net/openstack-cisco/+bug/1167146
Re-added an erroneously removed '$'
Merge conflicting bonding changes
Merge branch 'multi-node' of https://github.com/CiscoSystems/folsom-manifests into upstream/multi-node

Conflicts:
	manifests/cobbler-node.pp
Merge branch 'dt-multi-node-ra' of https://github.com/michaeltchapman/folsom-manifests into michaeltchapman-dt-multi-node-ra

Conflicts:
	manifests/cobbler-node.pp