[MERGE] add tail and move rcu lock

Signed-off-by: David Goulet <dgoulet@efficios.com>