(cherry picked from commit f72b3099)

Conflicts:
	offapi/com/sun/star/ui/dialogs/WizardButton.idl
	offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
	offapi/com/sun/star/ui/dialogs/XWizardController.idl
	offapi/com/sun/star/ui/dialogs/XWizardPage.idl

Change-Id: If651451b86829c7f066272e9362e3943f56cbf34