title: Magnolia 5.5 CMS: Mark hotfixes to be removed with next update
body: <p>If I override a resource in Magnolia 5.5 with a quickfix, is there a possibility to mark that resource so that the quickfix will be removed with an update of the source files.</p>
  
  <p>(For example if I make a quickfix and simultaneously I commit a real fix to say svn on an update the resource is still overridden with the quickfix and not with the real fix.. )</p>