Add the CSFR token to the frontend layout. This should hopefully allow a mapping to be deleted without having to skip forgery protection.
Merge commit 'd4a0597f45b8ef835f5cdc43abb22cc28e155025' into HEAD