1.18 release

Change-Id: I765b53df50a20d0fdd5353990ddcd76778c0906b
1.19-SNAPSHOT is the next development version

Change-Id: I24b9456312177dbdf53785bcb5ae78a98cc283de