Updated description for setStandardLocationTypes
#1127 Added a Broadleaf-merge-behavior SmartContextLoader for use with Spring 4 Integration tests