Quick fix: resolve merge conflicts
Quick fix: resolve merge conflicts

Change-Id: Ibd51ccf63136ee54c4ee6f916b353fef8c416d3e

hmcl/Streams,hmcl/Streams,hmcl/Streams,hortonworks/streamline,hmcl/Streams,hortonworks/streamline,hmcl/Streams,hortonworks/streamline,hortonworks/streamline,hortonworks/streamline