Merge branch 'master' of git@ServGitLab01.interne.lyrtech.com:nrw_noa/osmo-pcu.git into nrw/merge-master-15092017

Change-Id: I1e78f46bc8f3ba9cd2dd9baf510401c877e0fa53