Merge branch 'origin/release/1.7.x'

This pulls the release branch 1.7.x back into master, so that master
gets the changelog entry for the 1.7.1 release.

Below are the cherry-picked changes that were on the release/1.7.x
branch at the time of this merge.

* origin/release/1.7.x:
  Update changelog for v1.7.1
  Merge pull request #1389 from dholbach/fix-827
  Merge pull request #1372 from weaveworks/issue/1371-podcontroller-encapsulation
  Merge pull request #1369 from alanjcastonguay/patch-1

CHANGELOG.md

@@ -11,6 +11,26 @@ operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md).
 
 - ..
 
+## 1.7.1 (2018-09-26)
+
+This is a patch release, mainly to include the fix for initContainer
+images (#1372).
+
+### Fixes
+
+- Include initContainers when scanning for images to fetch metadata
+  for, e..g, so there will be "available image" rows for the
+  initContainer in `fluxctl list-images`
+  [weaveworks/flux#1372](https://github.com/weaveworks/flux/pull/1372)
+- Turn memcached's logging verbosity down, in the example deployment
+  YAMLs [weaveworks/flux#1369](https://github.com/weaveworks/flux/pull/1369)
+- Remove mention of an archaic `fluxctl` command from help text
+  [weaveworks/flux#1389](https://github.com/weaveworks/flux/pull/1389)
+
+### Thanks
+
+Thanks for fixes go to @alanjcastonguay, @dholbach, and @squaremo.
+
 ## 1.7.0 (2018-09-17)
 
 This release has a soupçon of bug fixes. It gets a minor version bump,