Merge pull request #199 from pentaho-skarmali/PRD-4565_testTwoSeparateFunctions

Removed scratchpad project - was a test project
PRD-4663:  Moved the metadata for data factory bundle into it's own properties file.  Updated bundle-name to point to the new bundle properties file.
Merge pull request #200 from pentaho-skarmali/PRD-4663_missing_resource_exception_report_wizard

PRD-4663:  Moved the metadata for data factory bundle into it's own prop...
PRD-4565:  Added back logic to handle cononical function match and adjusted logic.  Fixed getParameterCount() as it was always returning the number of parameter fields without regards to if there is any values in there.  Fixed catch-all logic.  Added more test cases.