Remove changes in cinder/context.py

Change-Id: I2dd8dc071f629ee22bde840b2c953354b1bedc0a