PRD-4716: Changed build so that samples are added recursively to bundle.