Merge "bug fix: output colorformat configuration fixed" into oc-dev am: 1e15657ca1 am: 0e42ac3399
am: 8421c086dd  -s ours

Change-Id: I60d0308598804da7295c3e5f0000612b6d0310cc