Added additional service types

Added Heat service type "orchestration" and "cloudformation"
which provide for the heat api for both the engine and cfn.