Revert "fix/rename callerid to caller_id in users test"

This reverts commit 8d7a4a0012f9c6caa05ad722ebd7e9489c245e73.
Revert "Merge branch '4767_user_fields'"

This reverts commit d2886a3d77180303bcf9d89068360cd1b07de596, reversing
changes made to 310e3721d6e79ae4051a664474ab764d0feb2b84.