Merge "Update janus, springboot, and aai-common deps"