final commits for move of trunk to 3.0.14-SNAPSHOT