Refs #8449 Python test fails, remove changes until problem fixed
Merge branch 'feature/8449_sassena_stamp_removal' into develop