EUCA-6941 Backport: EUCA-6817 Meta Data failing during BFEBS tests