Added more configuration upgrade handling [tracker #1667]