* commit '4522bd12a4f3d2b0c3156fc70937f78bed15a1f8': Fixed upgrading from forward-lock application to system application