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
Fix RPM spec file with flattened logging directories.
Fix compile in centric-troubleticketer for slf4j.
add fatal (same as error) to levels to satisfy some logging stuff in slf4j
Merge branch 'master' into pull-requests
some test config fixes
Merge branch 'master' into pull-requests
convert events archiver to log4j 2
use integer event IDs (not strings)
make fatal higher, so some tests pass
Merge branch 'master' into pull-requests
remove duplicate org.slf4j:slf4j-api dependency.
ignore event archiver logging file, also make the config name less confusing