Merge "Enable log level management via actuator, /cps/api path to use for REST contro...

diff --cc cps-rest/src/main/resources/application.yml
Simple merge

diff --cc cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
index 60f54bf,2d4fe9b..540d622
--- 1/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
--- 2/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
+++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
@@@ -176,22 -142,9 +180,22 @@@ class AdminRestControllerSpec extends S
          return new MockMultipartFile("file", filename, "text/plain", content.getBytes())
      }
  
 +    def createZipMultipartFileFromResource(resourcePath) {
 +        return new MockMultipartFile("file", "test.zip", "application/zip",
 +                getClass().getResource(resourcePath).getBytes())
 +    }
 +
 +    def createMultipartFileForIOException(extension) {
 +        def multipartFile = Mock(MockMultipartFile)
 +        multipartFile.getOriginalFilename() >> "TEST." + extension
 +        multipartFile.getBytes() >> { throw new IOException() }
 +        multipartFile.getInputStream() >> { throw new IOException() }
 +        return multipartFile
 +    }
 +
      def performCreateSchemaSetRequest(multipartFile) {
          return mvc.perform(
-                 multipart(schemaSetsEndpoint)
+                 multipart("$basePath$schemaSetsEndpoint")
                          .file(multipartFile)
                          .param('schema-set-name', 'test-schema-set')
          ).andReturn().response