Merge "Moving Historical Queries to spring boot"

No match.