closes #987 also updated lifecycle-hooks/e2e-spec for changed hook calling sequence (not a bug; just a change)