Merge branch 'fsiddi-master'

Merge in no billing plan patch for subscription sample application
Update billing agg search transactions and travis build