Merge /head:261072: Remove WITHOUT_ATF from src.conf.5

Approved by:	hrs (mentor)