Properly load modules.conf

This was a missing (+) from the context header, this failed to properly
load the modules listed in modules.conf.

Change-Id: Ic49216f9e059267ce5a13a8304bc703720e128b8
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Merge "Properly load modules.conf"