CRM-13737 add finder fn for alternate folder structures

Conflicts:
	civicrm.module