Fix bug 1359451 - [IBM] Way to skip setup-quantum-in-keystone.py during setup_cfgm
Bring in keepalived fix from R1.10 to mainline.

Change-Id: Ibc795b6d8eaec8960e0c5ea3f49f889788b66df3