Don't allow_note if shipping_instructions = false
Merge branch 'allow-note-if-shipping-instructions-enabled' of https://github.com/Scoutmob/spree_paypal_express into 1-3-stable