[PRD-4552] embedded function in params was replacing main one if same name
git crlf conflict
[PRD-4552] test case
PRD-4673: Add showHidden flag so that we can receive hidden files from the server.
PRD-4673: Add logic to handle hidden flag on VFS files
PRD-4673: UI changes to handle the hidden file selection
Merge pull request #198 from tmorgner/master

PRD-4673: Allow to see hidden files
Merge pull request #195 from tgf/prd-4552

[PRD-4552] embedded function in params was replacing main one if same name
Removed scratchpad project - was a test project
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...