Merge "VNFSDK - revert back to embedded postgres"