Merge "Revert "PNF service instantiation using building blocks fails""