Merge changes I9ec71290,I6c20de69

* changes:
  Don't allow project owners to delete branches if force push is blocked
  Add acceptance test for testing branch deletion via REST