Bustage fix for bug 1035599, r+a=bustage-fix for CLOSED TREE

--HG--
extra : rebase_source : 9fc6f0cc80749f869abf3124b6fecd490b023d1c
extra : amend_source : a53044cb583fb213903092848faccc087bab6289