Minor improvement in bootstrap method listeners merge.

Change-Id: Ib79a1e12bf93f53f44765ac2add526c3ccecfa6f
Updated test for custom application listener.

Change-Id: I32e556441e7ba46367b1a1a7485ab00e0cdcd6df