Updates for doc branch.
Update some recipe files to track changes in master.