Merge "Allow deploy nova.compute with nova.controller on same host."