parallel option in tests, comment out old version.
parallel option in tests, comment out old version.


Former-commit-id: ad343a15c5662984d249efde778c8ceb88bf9fa0 [formerly 68d2297516bef916cd1f5b11ca6dddb1b725d9ec]
Former-commit-id: c5b648e0c77e216b5864cf90ba8d54fc7b03e494
jason-neal/eniric,jason-neal/eniric