Added previous/expected reports for subscription and package
Forgot to commit bootstrap.
Fixed errors with reports
Merge branch '4.2-dev' into newdev