More supported file extensions for Spark templates & "Refactor for CSP"
Merge pull request #3277 from ussuri/add-more-supported-file-extensions

More supported file extensions for Spark templates & "Refactor for CSP"