Merge changes from master#2

hamza1886 wants to merge 10 commits intoonebeat:masteronebeat/role-based-access-control:masterfrom

hamza1886:masterhamza1886/role-based-access-control:masterCopy head branch name to clipboard