Backport #1124:Alter order of HR and lease lookup in allocation engine when looking for a free lease

Backport #1124 (closed) to v1_6_0.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information