Bug 860559 - Add pref field to ContactField and ContactAddress. r=gwagner sr=mounir

--HG--
extra : rebase_source : 098d9071232058bdf4a0f9547398eca9c4303106