Merge pull request #2514 from sandinak/feature_luci_stats_multiple_ups