Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Don't depend on update ACL to create a branch Change-Id: Iebbd7750e8a97c1c035dacac80d3939baa2ed2f5