GitLab

# Conflicts:
#	apps/roster/src/roster.erl

(cherry picked from commit 8ed2905)

(cherry picked from commit ab4daae)

(cherry picked from commit 3d53aa3d)

(cherry picked from commit 42790a9d)

(cherry picked from commit ae0721c5)

(cherry picked from commit 6cc2cea9)

(cherry picked from commit 6991c597)

(cherry picked from commit b62302cf)

(cherry picked from commit 618e7f68)

(cherry picked from commit 12c17c7e)

(cherry picked from commit 71de0ea5)

(cherry picked from commit 1e8a0596)

(cherry picked from commit cbc2c0f0)

(cherry picked from commit c153bd1d)

(cherry picked from commit 47136f91)

(cherry picked from commit 618e7f68)

(cherry picked from commit 12c17c7e)

(cherry picked from commit 71de0ea5)

(cherry picked from commit 1e8a0596)