#GH383 - configure branch review 2

setProperty for rebase also