Merge "Revert "Solution for Artifact Gen for PNFResource""