FLUID-4907: Prepare the code base for adding in message loader apart from current template loader.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907