Fix overwriting of BDDC weights.
Merge branch 'master' into 1.8.0_master