Removed no-longer-used moduledistro dependencies
Fixed NPE in FormManager with encounters that came from forms with associated form descriptor