Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev