remove one additional call to request object in order to return
servlet context

Change-Id: I160a4e80b0cd45cbc8dac6d71e7075c01e93d953