Load user-provided settings after role-provided settings
Load user-provided settings after role-provided settings

Fix-up for an issue with I7d1d747e1 pointed out by Bryan. Also sneaking in a
fix-up for .settings.yaml not existing. Shh.

Change-Id: I853d8a948656d17e354df40662bfb00426dc4d4d

HarriAlasi/wiki3dviewer,ankita-kumari/mediawiki-vagrant,stuartbman/mediawiki-vagrant,ankita-kumari/mediawiki-vagrant,HarriAlasi/wiki3dviewer,wikimedia/mediawiki-vagrant,HarriAlasi/wiki3dviewer,HarriAlasi/wiki3dviewer,stuartbman/mediawiki-vagrant,ankita-kumari/mediawiki-vagrant,stuartbman/mediawiki-vagrant,stuartbman/mediawiki-vagrant,stuartbman/mediawiki-vagrant,ankita-kumari/mediawiki-vagrant,ankita-kumari/mediawiki-vagrant,stuartbman/mediawiki-vagrant,wikimedia/mediawiki-vagrant,wikimedia/mediawiki-vagrant,wikimedia/mediawiki-vagrant,wikimedia/mediawiki-vagrant,HarriAlasi/wiki3dviewer,wikimedia/mediawiki-vagrant,HarriAlasi/wiki3dviewer,ankita-kumari/mediawiki-vagrant,HarriAlasi/wiki3dviewer,stuartbman/mediawiki-vagrant