LPS-39202 editted properties

The property comments are rewritten and @topolik did me the favor of rebasing/resolving the code with upstream master. 

Thanks.