apache::def: port to env-{enabled,disabled}

Change-Id: I4316c0cbb47f2ddd1b6e82fbd68b36e9700fa1cf
Merge "apache::def: port to env-{enabled,disabled}" into production