re-commit regex fixes for WEB-7972