Fix for Bug NMS-6489

Upgrade Tools issue: the snmpStorageFlag from datacollection-config.xml
is not being considered while running SnmpInterfaceRrdMigratorOnline.

The filter for selecting the SNMP interfaces where snmpCollect is 'C' or
'UC' was removed in order to consider all kind of scenarios for data
collection, specially when snmpCollectFlag="all".

The solution was tested on a lab using a real DB/RRD from a customer.
Cosmetic enhancement for SnmpInterfaceRrdMigratorOnline

Order the output of the SQL query to obtain the list of candidates of
intefaces to be merged by nodeId and ifDescr (to facilitate debugging).
[bamboo] Automated branch merge (from 1.12:399c31ed31f3e655119a036d917a39b0c9190f90)