Prevent another migration from failing due to indirect use of model columns not yet created

See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077

cc @marin

See merge request !1597