Resolve formula regressions in cdk-data. A new test was added to check for NPEs when adding formula, only cdk-silent updated.

Change-Id: I858ff5ddb64f44a1b9c99653b382ffdd3b47e307
Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>