Support multiple config file options on quantum-server command line

fix bug #1156831

Change-Id: Id05929c3114bc385c09fc25179cc15a358d38189
Merge "Support multiple config file options on quantum-server command line"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp