Avoid client configuration of core.pp by supporting the override of all config options in the control and compute nodes from site.pp. Also changed the appropriate parameters to explicity pull config from global scope, which makes it a little more comprehensible than ~50 'x = x' statements. https://bugs.launchpad.net/openstack-cisco/+bug/1159598
Merge branch 'dt-multi-node-config' of https://github.com/michaeltchapman/folsom-manifests into michaeltchapman-dt-multi-node-config

Conflicts:
	manifests/core.pp
Merge remote-tracking branch 'upstream/multi-node' into multi-node_dt-config