source for org.opennms.smslib is missing, USSD was fixed in org.smslib 3.4.6 which is not in maven and can't be build, upgrade to 3.5.x
source for org.opennms.smslib is missing, USSD was fixed in org.smslib 3.4.6 which is not in maven and can't be build, upgrade to 3.5.x
Merge branch 'realthargor/smslib' of github.com:OpenNMS/opennms into realthargor/smslib
Merge remote-tracking branch 'origin/realthargor/smslib' into pull-requests

Conflicts:
	features/sms-reflector/commands/src/main/java/org/opennms/sms/reflector/commands/internal/SmsCommands.java
	features/sms-reflector/commands/src/main/java/org/opennms/sms/reflector/commands/internal/USSDNotification.java
	features/sms-reflector/sms-service/src/main/java/org/opennms/sms/reflector/smsservice/internal/GatewayGroupListener.java
	features/sms-reflector/sms-service/src/main/java/org/opennms/sms/reflector/smsservice/internal/SmsServiceListFactoryBean.java
fix some merge-related issues
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests

Conflicts:
	features/sms-reflector/sms-service/pom.xml
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests

Conflicts:
	features/sms-reflector/sms-service/pom.xml
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Fix for Bug NMS-5020

Note: the issue was related with javamail-properties and reportd, but I
was able to verify that reportd doesn't have any problems. But, the
report scheduled configured through the WebUI requires changes. Both are
working fine right now.
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
Merge branch 'master' into pull-requests
log4j-over-slf4j, not slf4j-log4j12