Merge pull request #13698 from mthsena/3.3.5

Scripts/MountHyjal: Kill warning
Core/RBAC: Move two side trade to RBAC