Merge "Remove testDatabaseEnabled" into jb-mr2-dev