Merge "Remove unused message 'resetpass'"