Mixing containers and BM is currently not working. Once the master
promotion will take place we will have a fluentd container and
can readd fluentd as a container and the problem should not re-occurr.
Change-Id: Iad97f7e0e4de56f46a46d2381fc1ea5822a2114a
Related-Bug: #1726891
(cherry picked from commit 35d91ddc6d11bb2696321fff4593d5cca3b0cba8)