Modifictions to make different data_dir work

Found an issue: https://tickets.opscode.com/browse/COOK-3674

This fix is the first step toward fixing that. I also added a new set of
regression tests for a non-default data_dir value