extend PrivilegeObjectDesc with type to handle server and uri
Merge branch 'trunk' of https://github.com/HuangXiaomeng/hive into trunk