BugLink: http://bugs.launchpad.net/bugs/1532886

Change these config settings to be consistent with all of the other
architectures.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>