SatelliteQE/robottelo — pull request #1803 by kbidarkar (2014-12-24 09:11:11+00:00)
Title: Fix for the missing proceed_edit locator.

Depending upon whether the org and locator being selected,
the host selection page appears. Now instead of `edit` flag,
depending upon the locator's availability the proceed_edit
button is selected.

Conflicts:
robottelo/ui/factory.py
tests/foreman/ui/test_location.py
tests/foreman/ui/test_org.py

git cherry-picked from master: 5066f6e4da87fdbaec03aa5c002a080ac16c13bd