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