Merge UserProfile into User model

Merged Dmitry Volodin requested to merge noc-merge-userprofile into master

Merge request reports