Bug 870148 - Check vality of tel.value when importing contacts. r=gwagner

--HG--
extra : rebase_source : 67889d60976fdd3e709d687981b6923cf350f4a2
Bug 870148 - Check validy of email.value when importing contacts. r=reuben

--HG--
extra : rebase_source : f008fb7ae6807eb0240ebe817e88c38100cc367d
Bug 871956 - Fix regression introduced by bug 858416. r=kanru
Merge the last PGO-green inbound changeset to m-c.
Merge m-c to inbound.