Support for user directives' params.
Conflicts:
	gradle.properties
Fix variable discovery in a custom directive's params
Put in null guards just in case.
Yuck, that was ugly.
Recognize dotted variables as shadowed by base variable.