Spring context cleanups.
#SB-267: Create a RestClient for the non-artifact REST API

Minor polishing.