New SVG icons built from Cisco EPS formatted public icons
  http://www.cisco.com/web/about/ac50/ac47/2.html
  "Cisco icons are globally recognized and generally accepted as standard for network icon topologies. You may use them freely, but you may not alter them."
Merge branch 'master' of github.com:OpenNMS/opennms
Merging new SVG icons commit
extented categoryname field in database table categories from varchar(64) to text
changes liquibase database update for longer category-names to match the 1.12.5 version
update other create.sql files just in case
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/schema/src/main/liquibase/changelog.xml
NMS-6361 fix handling of spaces in filename
Corrected switch OID to icon mapping.
Fix for NMS-6409 - Upgrade 1.12.4 breaks StoreByForeignSource

There was a typo error on ResourceTypeUtils. This class was updated in
order to have a centralized way to ask if storeByForeignSource is
enabled (like storeByGroup).

DefaultCollectionAgentService was updated to use ResourceTypeUtils for
this purpose.

Some code was removed from CollectorThresholdingSet related to this
feature because it is not required.
Fix for NMS-6365 - Empty resource label where there's no PM Group for measObjLdn
Enhancement: NMS-5738

- added additional space between login and password
- removed Reset button which is the first button with tab
  and causes strange usage behavior. Normally log in pages
  don't have a resets for the input field
Added another 8072 OID to icon mapping.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectorThresholdingSet.java
	opennms-webapp/src/main/webapp/login.jsp
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java
merge bug, LogUtils
Merge remote-tracking branch 'origin/master' into jira/PJSM-163
Merge remote-tracking branch 'origin/master' into jira/PJSM-163
move collectd configuration to opennms-config-jaxb

* move the old IPAddress class to core/api
* move some of the functionality of InetAddressUtils to the IPAddress class
* convert collectd package code to not rely on inetaddress APIs from opennms-util