Setting initial merge info for JAFFA_5_14_RELEASE
Authored by: erikb78 2013-02-01
Parent: [r6889]
Child: [r6891]