Tidy up foundation.conf, removing old/commented/un-needed config

Change-Id: I9bae168693418cf6a424f0945e4a1bd5e0e0b19e
Merge "Tidy up foundation.conf, removing old/commented/un-needed config"