Fix for Meritocracy policy

Meritocracy unintentionally gave happiness for connected cities reduced
unhappiness from population in non-Occupied cities