Revert some of the changes to RefreshScope and @Configuration

Some things were changed in Spring and some problems are fixed
(while at least one is not - scope!="refresh" for a @Configuration
with @RefreshScope)