Merge "Remove Unused Releng Macros"