Merge changes I60c73713,I5598a2b1

* changes:
  Make system properties read only.
  Remove use of file absolute paths.