Merge "Add documentation for *.sysprop"