Refactored to use a single prj.conf file. Fixes #52754 Signed-off-by: Mark Watson <markus.c.watson@gmail.com>