Fix for #991. We needed the prefix to get the classes that implement address validation when the app is packaged.
Escaping the underscore in the query that finds address validators.
Merge pull request #993 from SalesforceFoundation/feature/991-settings-nullpointer

Feature/991 settings nullpointer
Merge dev into feature/983-data-importer