Merge pull request #15977 from mikehenrty/bug-966571-retrycount

Bug 966571 - Retry count not shown up in System SIM Dialog, r=arcturus,alive,ferjm
(cherry picked from commit 9de7295648e4bbbacfb90e897f50fbae0de4ee43)

Conflicts:
	build/jshint/xfail.list
Merge pull request #16234 from mikehenrty/bug-966571-uplift

Merge pull request #15977 from mikehenrty/bug-966571-retrycount