fixes system.close() by including all involved data stores. moves to
2.8.0-SNAPSHOT