Merge pull request #384 from rcordovano/develop-rc1

Corrected handling of always calc hashes flag
Fixed npe while getting data source name for local files.
Merge pull request #385 from jawallace/develop-rc1-logical-file-fix

Fixed npe while getting data source name for local files.
Fix for scheduling of derived files