workaround lack of jinja2.7 support
add sanity checking steps and fix KUBE_MASTER_IP
switch kubelets to connect to etcd on cloud network

Previously we were connecting across the public interfaces. This will connect across eth2 and send communication over a private network.
Merge pull request #1120 from doublerr/rackspace/fix_salt_apiserver

Rackspace: fix apiserver salt config
Fixup name vs ID terminology
Merge pull request #1137 from derekwaynecarr/name_vs_id_fixup

Fixup name vs ID terminology
Introduce the simplest RestartPolicy and handling.
Address comments
address some comments