Merge pull request #3211 from ktsaou/master

multiple APC UPSes;