RT 7858: datasets Apache and Puppet edits.

Change-Id: I7ab419bc14246cee3fe7b74063a06384c3620f40