Mpls. City Council approves police, fire pension mergers