Merge pull request #2470 from mabaiocchi/master

Pull in P8 PNOR XML Layout Fix for HBD/HBD_RW Partitions