Fix dup Actor node in xml and add role consolidation
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser