Ok, after after combing through everything here is what I think has happened (keep in mind I'm just a layman in these matters):
The original 2 amendments from Heller (2394 & 2395) got rolled into 2282. 2282 passed as the senate's proposed changes to the houses' original 5515 that the house approved previously. Since 2282 got sent over for conference the issue is technically still in play.
However in reading the actual written text of 2282 our stuff isn't in there. Perhaps a revised version will come out Monday but the only reference I can find is 2394 & 2395 simply appearing in the mosh pit of 494 total amendments to 2282.
I'd guess the general confusion (even from congressional offices), tone of the MOAA, plus their relative silence on the issue probably points to this getting taken out of the final bill.
Hopefully we get lucky but I'm not holding my breath for it this year.
ETA: odd pedestrian explained it all correctly, I just couldn't wrap my head around it at first till I ran it all to ground. Nothing showing up in the full text of the proposed changes was throwing me off. Best I can tell it's on the summary page but as just a number with no further info.