diff --git a/anvil/components/__init__.py b/anvil/components/__init__.py
index cf62d3dd..343f82e2 100644
--- a/anvil/components/__init__.py
+++ b/anvil/components/__init__.py
@@ -934,7 +934,7 @@ class PythonTestingComponent(component.Component):
         pep8_wanted = None
         if isinstance(i_sibling, (PythonInstallComponent)):
             for p in i_sibling.pip_requires:
-                req = p['__requirement']
+                req = p['requirement']
                 if req.key == "pep8":
                     pep8_wanted = req
                     break
diff --git a/anvil/packaging/helpers/changelog.py b/anvil/packaging/helpers/changelog.py
index 07c9a623..897fa2c3 100644
--- a/anvil/packaging/helpers/changelog.py
+++ b/anvil/packaging/helpers/changelog.py
@@ -35,6 +35,15 @@ from anvil import utils
 LOG = logging.getLogger(__name__)
 
 PER_CALL_AM = 50
+SKIP_EMAILS = [
+    'jenkins@review.openstack.org',
+]
+SKIP_SUMMARIES = [
+    re.compile(r'^merge commit', re.I),
+    re.compile(r'^merge branch', re.I),
+    re.compile(r'^merge pull', re.I),
+    re.compile(r'^merge remote', re.I),
+]
 
 
 def translate_utf8(text):
@@ -85,13 +94,12 @@ class GitChangeLog(object):
                 LOG.warn("Non-utf8 field %s found", f)
                 return True
         email = email.lower().strip()
-        if email in ['jenkins@review.openstack.org']:
-            return True
-        summary = summary.lower().strip()
-        if summary.startswith('merge commit') or \
-           summary.startswith("merge branch") or \
-           summary.startswith("merge remote"):
+        if email in SKIP_EMAILS:
             return True
+        summary = summary.strip()
+        for s in SKIP_SUMMARIES:
+            if s.search(summary):
+                return True
         if not all([summary, date, email, name]):
             return True
         return False