fix failing test (move remembered set from BuildContextHolder to ResourceChangeHandler)
Merge branch 'issue897' into 1.7.x