#1141 - Make property retrieval use the system property service
(cherry picked from commit e7ef2a7)