Merge pull request #24 from chamankang/develop

move nova-conductor to compute-api