HBASE-19889: Revert Workaround: Purge User API building from branch-2 so can make a beta-1
HBASE-19889: Revert Workaround: Purge User API building from branch-2 so can make a beta-1

Signed-off-by: Peter Somogyi <dfe29050aae9e16fc6784bf10581623b02587478@apache.org>

HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase,HubSpot/hbase