Get picky with ConfigurationSourceProvider and friends.
Merge remote-tracking branch 'upstream/master'
update to latest.