Fixing shindig startup failure IDENTITY-2633