Some ConfigurationProvider -> theDefaultProvider simplifications

Change-Id: I7c25cd94f8a1ca339f7423c26f21f13c7a68906d