Pick select NI 6.1 commits to 5.15

[mike-petersen-ni]

Cherry-picking some NI commits from the 6.1 branch since we haven't touched the 5.15 branch for a while and may use it again. AB#2519871

Will wait for completion of #134 before publishing since this branch is based on that one.

Commits we wanted to pick:

• 111

  • 322f06a5b4ad (already picked: baa47c510cd3)

• 114

  • 297a39e6ad61 (already picked: 3b4ec35227d0)

• 115

  • 226814774d97 (already picked: 4790f19d2bce)
  • 4a8405033f44 (already picked: 1132611b9348)
  • 36fd937ce1a7 (already picked: 98883b1c6d3f)

• 123

  • 5e47a5623bbc (to be merged in #134: 6f126e026307)

• 131

  • 187c39d51f44

• 133

  • 57e0ad1f311d

Thanks to @dylan-matthew-turner for collecting the list of commits.

Testing

• [x] successful build