Married HD wallets: Bloom filter adjustments

Bloom filter for married keychains will contain serialized redeem script and it's hash for each set of married keys.
OK. Yes the intersection of all the various features gets complicated rapidly, e.g. encrypting a married wallet that is undergoing key rotation, argh!! :) I'm OK with just not allowing all features to be used together for now, we can always flesh out the feature matrix later.