Clenup and use of proeprties in scm config

Change-Id: Id8941ce0d4444395b3d4a83fc7e5e43eea6e080d