Merge branch 'i33422-rest_bugnote_update' into master-2.26
PR https://github.com/mantisbt/mantisbt/pull/1954