Merge "[CPS] Fix postgres init job dependency"