FELIX-3870 Use write lock around modified method to assure activate/modify/deactivate don't overlap

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1438607 13f79535-47bb-0310-9956-ffa450edef68