Temporary switch to contents instead of contents_pillar for 0.16.x
Updated required comment to include validation_client_name