Germany's upper house approves massive defense, infrastructure funding