Rally Finland secures two-year deal to stay on WRC calendar