Resolve merge conflicts for pod and cluster resources (PR #217)#220

sidshas03 wants to merge 4 commits intoapache:mainapache/cloudstack-terraform-provider:mainfrom

sidshas03:pr-217sidshas03/cloudstack-terraform-provider:pr-217Copy head branch name to clipboard