Bug 959019: avoid ADDITIONAL_BUILD_PROPERTIES. r=mwu