Merge "[APPC] Use global storage templates for PVC"