Merge "Add volume-attached resize revert server test"