Removed locally declared functions from functx module.

References #613.
Merge remote-tracking branch 'upstream/master'
Replaced $config:commons-collections-permissions with
$config:collection-mode.
Replaced prefix 'xdb' with 'xmldb', and removed import statement for
'xmldb' module.
Merge pull request #33 from claudius108/master

Replaced $config:commons-collections-permissions