Merge "Bug 499: Added support for old DOM Broker APIs."