Merge "Add ability to force peer uuid in case of recovery and add bricks"