Add v2.36 for windows bug fix
Fix priority set wrong for Treasurer Processor
Move fixes from 2.36 branch to 2.40 branch