Match the OpenShift Redis env var names to what the cartridge provides

Also fixed a few whitespace probs in the same file while at it