fixes #6334 Encoding not correct when importing data
Adding new methods to BlockDirectiveCache.
Restoring BlockDirectiveCache and BlockDirectiveCacheImpl. Created BlockPageCache and BlockPageCacheImpl instead.
Fixes #6586 : Pushing modified container not reflecting changes in pages using it.
#4633
#6613: Add Catch to Username not exists in DB
Merge remote-tracking branch 'origin/master' into issue-6613-password-functionality-leaks-information
#6613: Moving Logic into the controller
Merge pull request #6468 from dotCMS/issue-6334-Encoding-not-correct-when-importing-data

fixes #6334 Encoding not correct when importing data
Merge pull request #6607 from dotCMS/issue-6586-pushing-modified-container-not-reflecting-changes-in-pages-using-it

Issue 6586 pushing modified container not reflecting changes in pages using it
#4633
Merge pull request #6610 from dotCMS/issue-4633-timemachine-does-not-copy-dotasset-files

#4633
Merge pull request #6625 from dotCMS/issue-6613-password-functionality-leaks-information

#6613: Add Catch to Username not exists in DB
#6745: Merge with Master