Fix bug 1359451 - [IBM] Way to skip setup-quantum-in-keystone.py during setup_cfgm

Change-Id: I43fafbe43a56deb0376a5448f002a8e83c2c4d39
Merge "Fix bug 1359451 - [IBM] Way to skip setup-quantum-in-keystone.py during setup_cfgm" into R1.10