updates from unstrung tree
various updates from openswan