diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
index 8db01ff0..e277b0c2 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
@@ -65,7 +65,7 @@ public class CommonsClientAutoConfiguration {
 
 		@Bean
 		@ConditionalOnProperty(value = "spring.cloud.discovery.client.composite-indicator.enabled", matchIfMissing = true)
-		@ConditionalOnBean(DiscoveryHealthIndicator.class)
+		@ConditionalOnBean({ DiscoveryHealthIndicator.class, HealthAggregator.class })
 		public DiscoveryCompositeHealthIndicator discoveryCompositeHealthIndicator(
 				HealthAggregator aggregator, List<DiscoveryHealthIndicator> indicators) {
 			return new DiscoveryCompositeHealthIndicator(aggregator, indicators);
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java
index 3fcf4830..6ac4d86d 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.context.encrypt;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.regex.Pattern;
 
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.openssl.MiscPEMGenerator;
@@ -36,6 +37,8 @@ import org.springframework.security.rsa.crypto.RsaSecretEncryptor;
  */
 public class EncryptorFactory {
 
+	private static final Pattern NEWLINE_ESCAPE_PATTERN = Pattern.compile("\\r|\\n");
+
 	private String salt = "deadbeef";
 
 	public EncryptorFactory() {
@@ -53,7 +56,7 @@ public class EncryptorFactory {
 			try {
 				String normalizedPemData = normalizePem(data);
 				encryptor = new RsaSecretEncryptor(
-						normalizedPemData.replaceAll("\\n", "").replaceAll("\\r", ""));
+						NEWLINE_ESCAPE_PATTERN.matcher(normalizedPemData).replaceAll(""));
 			}
 			catch (IllegalArgumentException e) {
 				throw new KeyFormatException(e);