Bug 860660 - [settings][dialer][system] PIN/PUK retry counter now displayed correctly.  r=fcampo

Conflicts:
	apps/communications/ftu/js/sim_manager.js
	apps/system/js/simcard_dialog.js