Harmonize static scope handling with upstream

change some code related to static credentials and system scope
back to how it is implemented in upstream.

Change-Id: Id466c9c1290782d3a3c8fa968f6dd5c17b1ed178
Related-Issue: PRODX-26229
1 file changed