[Default|Instance]Scope.INSTANCE is the singleton to be used.

Change-Id: I93e07fd94f6bbdec63353186de75d3b9eb070151
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>