Fix for Finish Button

Please also make the same change to the Vaadin7 port

...Advance() methods of the intermediate steps