Merge "Update reviewnotes plugin to latest revision"