more merge fixes, fix nova qpid conf for single
colocation for mysql