Merge branch 'release/2.0.14'
Corrected error messages to conform with webservice api documentation.
Merge branch 'release/2.0.15'
hotfix on wrong comparison
Merge branch 'hotfix/2.0.16' into develop