Partial fix for NMS-6386

The ILR reports wrong data when there are several packages with
different collection rates on collectd-configuration.xml for the same
service.

The partial solution is: move the EJN package from the default
collectd-configuration.xml to the one on the examples directory, because
that package is confusing ILR and it was created only for a very
particular kind of devices.
Fix for NMS-6424 - Exception on node.jsp with storeByForeignSource enabled and no data collection for the node.
Merge remote branch 'origin/1.12' into rc/stable/1.12.5
update docs for extra bugfixes