Merge pull request #1939 from soc/SI-6811-moves

SI-6811 Move scala.util.{automata,regexp} ...
SI-6998 Improvements to the task-support API