Re-inject opts into modules under multi-master mode.
Merge pull request #16663 from rallytime/cp-15848

Backport #15848 to 2014.1