Fix bug 915502

Only set RestCartridge.scales_with if a scaling cart is found.
Automatic commit of package [openshift-origin-broker-util] release [1.5.5-1].
Automatic commit of package [openshift-origin-node-proxy] release [0.6.4-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.5.5-1].
Automatic commit of package [openshift-origin-cartridge-mysql-5.1] release [1.5.4-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.5.6-1].
Automatic commit of package [openshift-origin-cartridge-haproxy-1.4] release [1.5.4-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.5.5-1].
Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [1.5.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.5.7-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.5.7-1].
Merge pull request #1451 from pmorie/bugs/915502

Merged by openshift-bot
Fix X-Client-IP.