Added guard condition to simplify logic.
Split out code paths of Page#normalize_friendly_id_with_marketable_urls
Attempt to fix intermittent spec failures.