Make the Price block override compatible with the parent.
Ensure that only products with order instructions (not blank) are shown
Merge branch 'develop' into mage-18