Merge pull request #1654 from TDT-AG/pr/20180301-luci-several-fixes