Merge proposals dependent on lp://qastaging/~dbarth/webapps-demo/ebay-fix

lp://qastaging/~dbarth/webapps-demo/ebay-fix has no merge proposals.