first wave of changes to support jdemo + other cookbooks