Various fixes to get build and tests working for Blueprints 2.5.0-SNAPSHOT#7

mikesname wants to merge 2 commits intodatablend:masterdatablend/fluxgraph:masterfrom

mikesname:tp-2.5.0-SNAPSHOTmikesname/fluxgraph:tp-2.5.0-SNAPSHOTCopy head branch name to clipboard