8209129: Further improvements to cipher buffer management

Corrected merge problem
1 file changed