Fix package override of core block templates

Allows for package to override core block custom template.

Sets flag if initial template is core and then if true includes package
block template check

http://www.concrete5.org/developers/bugs/5-6-0-2
/package-block-template-doesnt-override-core-template/