Merge pull request #1566 from colemanw/master

Fix return defaults CRM-13318
Fix faulty contact tests