Handle-ize field names for generated param list
Removed changes from master for easy cherry picking
Reset to original and update true/false to yes/no for select default
Merge remote-tracking branch 'origin/ds-name'

Conflicts:
	assets/conditionalizer.datasources.js