Rebase blackberry10 from apache/master

@tracyli I will also rebase cordova-blackberry so they can be tested together