CRM-12042 edge case protection
Merge pull request #131 from eileenmcnaughton/CRM-12042

CRM-12042 edge case protection
Don't include lock js on add new contact page CRM-12107
Merge pull request #132 from colemanw/CRM-12107

Don't include lock js on add new contact page CRM-12107