Small OCCI-OS compatibility fixes

CLI has to hide the fact that OCCI-OS uses 'os' and 'resource' mix-ins instead of 'os_tpl' and 'resource_tpl'.