Update sherpa to verision 2.1
Merge pull request #607 from degano/sherpa_210_62X

Update sherpa to version 2.1