Patches for Fix subst.in for non-upgrades [sf#1262777] [#503]