Bug 12393 needs special handling during the release. This patch does that.
Created attachment 29317 [details] [review] Bug 12492 [3.16.x] - dependency changes special handling Adds some dependencies manually, so that they aren't required at the moment, but will end up required when the control file is next regenerated.
Created attachment 29318 [details] [review] Bug 12492 [3.16.x] - dependency changes special handling Adds some dependencies manually, so that they aren't required at the moment, but will end up required when the control file is next regenerated.
Created attachment 29319 [details] [review] Bug 12492 [3.14.x] - dependency changes special handling Adds some dependencies manually, so that they aren't required at the moment, but will end up required when the control file is next regenerated.
These patches shouldn't go into master, they should go into their branch only.
Pushed to 3.16.x for inclusion in 3.16.4.