sync with stable branch

- added blackhat and qd externals
- updated to sherpa 2.1.0
- for now dropped sherpa dependency from cmssw-mic-tool-conf as blackhat is not compiling with icc