Change the scope for bouncycastle
Merge branch 'pom'