Configure: New option --upgrade added
Merge branch 'change-conf2' of https://github.com/tssavita/monkey into change-conf2