LPS-41447 Upgrade to BND 2.1.0

I have made the changes for the code to compile and updated bnd.bnd. 

However I could not test wether this is working...