CAS-1205: configured loading of the basenames to use custom first
CAs-1205: Removed unneeded condition, and fixed references to the custom bundle in tests