Update naming of os-independent-puppet data directory.

This makes more logical sense, particularly if using data in modules for
more than one purpose.