Fixed a Windows compilter error. Refs #8685.
Turned on parallel and cleaned code. Refs #8685.
Merge branch 'feature/8685_matrixws_filter' into develop