Userid exception
Merge remote-tracking branch 'origin/In-app-analytics-SOAP-2335' into In-app-analytics-SOAP-2335

Conflicts:
	smartbear-analytics/src/main/java/com/eviware/soapui/analytics/ActionDescription.java
	smartbear-analytics/src/main/java/com/eviware/soapui/analytics/AnalyticsManager.java
Analytics startup option dialog