FALCON-352 old properties not removed on refresh of runtime properties. Contributed by Shaik Idris