Unbreak merge of LogConfiguration config #978

Merged

rhuss merged 4 commits intofabric8io:masterfrom stromnet:propmerge-unbreak-logconfiguration

Apr 4, 2018

+209-18

Commits on Mar 26, 2018

Commits on Apr 4, 2018