VID-490 Use the master after changing the page props.

This eliminates race conditions with replication