Merge pull request #2557 from wghoffa/hwp_fix_01142019

Fix RC09 ODT errors on Nimbus Dual Drop Configurations