mm/vmscan: Add #ifdef around "WasActive page flag"

also fix a merge error @ putback_lru_page