catalyst: support patches conditional on an edition

Change-Id: I5362e4709cf80e9d075e3f9bb1d638a4fcaa2ec8
catalyst: only restore the file if python is enabled

Change-Id: Id387df56717cfab863520784035c09125042004a
Merge topic 'fix-extras-catalyst-patch' into next

29dddbe6 catalyst: only restore the file if python is enabled
8de1dc11 catalyst: support patches conditional on an edition