Routing table fixes, other updates

Merge https://github.com/openshift/puppet-openshift_origin/pull/4
Added support for broker and node collocated on same host (routing table changes)