Merge proposals dependent on lp:~abranson/rockwork/jsfixes

lp:~abranson/rockwork/jsfixes has no merge proposals.