Bug-194: Fixed bundle exports.

Change-Id: Ib7b8adcca0cb552c97aac313171259eb98a8ca77
Signed-off-by: Milos Fabian <milfabia@cisco.com>