Merged revision(s) 4871 from branches/Release/16_1_1: Implemented changes of reviews 873 and 877.........Related to Issue [WTI-737]git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@4872 5a3db67b-de53-47b5-99c8-a1c30a6650e2Former-commit-id: 7dc2c09ba55e97d0caf34f1c28987490239db3baFormer-commit-id: 7b63f58417bd89ffb249148d96d28be4541cf881