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

@devoncarew Makes sense?
Filed #3279