Scritunizer improvements.
Merge branch '7.x-1.x' of https://github.com/mateu-aguilo-bosch/ctools_token_access into 7.x-1.x