Bug 886055 - follow up, remove .orig files
Bug 896997 - Implement .stop method to localize wrapper; r=stas
Bug 896997 - Implement .stop method to localize wrapper; tests