exceptions while configuring app peer + unexpected Close Rib Singleton Service

This happened to build #1013; on the other hand, build 1012 and 1014 had 0 failures tests
https://jenkins.opendaylight.org/releng/view/bgpcep/job/bgpcep-csit-1node-userfeatures-only-boron/1013/

Problem 1:
Configuring app peer via restconf went well (status 20X), but logs show

2016-10-09 22:59:36,610 | WARN | lt-dispatcher-20 |
ShardDataTree | 185 - org.opendaylight.controller.sal-distributed-datastore - 1.4.1.SNAPSHOT | member-1-shard-default-operational: Store Tx member-1-datastore-operational-fe-0-chn-61-txn-0: Conflicting modification for path /(urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)bgp-rib/rib/rib[

{(urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)id=example-bgp-rib}

]/peer/peer[

{(urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)peer-id=bgp://10.29.12.134}

]/adj-rib-in/tables/tables[

{(urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)afi=(urn:opendaylight:params:xml:ns:yang:bgp-types?revision=2013-09-19)ipv4-address-family, (urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)safi=(urn:opendaylight:params:xml:ns:yang:bgp-types?revision=2013-09-19)unicast-subsequent-address-family}

]/afi.
2016-10-09 22:59:36,613 | ERROR | ult-dispatcher-2 | LocalThreePhaseCommitCohort | 185 - org.opendaylight.controller.sal-distributed-datastore - 1.4.1.SNAPSHOT | Failed to prepare transaction member-1-datastore-operational-fe-0-chn-61-txn-0 on backend
OptimisticLockFailedException

{message=Optimistic lock failed., errorList=[RpcError [message=Optimistic lock failed., severity=ERROR, errorType=APPLICATION, tag=resource-denied, applicationTag=null, info=null, cause=org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException: Node was created by other transaction.]]}

this leads to failures in other test cases when a route is configured via app peer and it is not advertised to the exabgp peer.

Probtlem 2)
2016-10-09 23:00:02,734 | INFO | entLoopGroup-4-2 | RIBImpl | 226 - org.opendaylight.bgpcep.bgp-rib-impl - 0.6.1.SNAPSHOT | Close RIB Singleton Service ServiceGroupIdentifier

{value=example-bgp-rib-service-group}

After this message all suites ara failing because all of the m use example-bgp-rib and such exception is resent in the log many times

Caused by: org.opendaylight.yangtools.yang.data.api.schema.tree.ModifiedNodeDoesNotExistException: Node /(urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)bgp-rib/rib/rib[

{(urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2013-09-25)id=example-bgp-rib}

] does not exist. Cannot apply modification to its children.