Merge "[DCAEGEN2] Use common secret template for postgres credentials"