Add troubleshoot to baremetal PXE template.

We recently added an optional troubleshoot parameter to
diskimage_builder which defaults to 0 (false).

This commit adds the option to the Nova pxe_config.template
so it will be easier for people to find should they need to
enable troubleshooting mode.
Change-Id: I169a5e3b7a9d80e18e389ae4645d2c5bbdae2a6f
Revert "fixes nova resize bug when force_config_drive is set."

This reverts commit 8ae97f24b0c806a438456170959ae527ce33ad01

This issue was already tracked and fixed in bug 1163598.
The user's packaged version was just lagging behind the released fix.

Change-Id: I9260ce7b00b0500b168f5a385696361b4f8e73fd
Merge "Add troubleshoot to baremetal PXE template."
Merge "Revert "fixes nova resize bug when force_config_drive is set.""
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp