Naming conflicts for service type from UI

ui calls the controller resource class 'controller' whereas our
overcloud.yaml expect 'not_compute' - until naming settles down
we should carry both otherwise, the notcompute resource doesn't
show up at all in the generated Heat template

Closes-Bug: 1240896
Change-Id: I75a3e6cddfef23d3a7be171aa518c2f222b98094
Merge "Naming conflicts for service type from UI"