Merge "[VNFSDK] Use common secret template for postgres credentials" into frankfurt