I came in like a storm, but then got quiet for a short while. I'm back to announce that I just had a successful first-run load-demo, with key-encrypting-key working. I've got 28(or so) changes upto today. Splitting this last little bit will add another 10(I got sidetracked on making GenericDelegator's constructors final, and they no longer leak 'this'). I should finally have this ready by the weekend.
entityengine.xml has a <delegator key-encrypting-key="$base64_des"/>, there is a TenantKeyEncryptingKey table(fetched from the base delegator once during construction). We might be able to finally fixed the unprotected jdbcPassword in TenantDatasource, but my patchset doesn't deal with that. I should have my code rebased and split by the end of the weekend.