Re-enable test_edit_photo, Bug 908449 is resolved

bug is resolved

`master` -> merge
`v1-train` -> not relevant