Merge "Update docs for regenerating sample conf file"