Merge pull request #485 from tyler-potyondy/dev/15.4-set-short-addr

Merge pull request #485 from tyler-potyondy/dev/15.4-set-short-addr #1894