Merge "Fix installing dumpstate test data"