Made apache compatible with mr1

Change-Id: I3d76c9da4e0845eb8e611090d3bfb5ded4b64cb0