Added on edit orphan cancel return to show orphan feature spec and f.options changes.
Added feature on cancel edit partner spec return to partner show page and updated controller to get spec to pass.