Properly close streams
Merge branch 'patch-2' of github.com:ArloL/BroadleafCommerce into ArloL-patch-2 and cleaned up a few areas as a result

Conflicts:
	common/src/main/java/org/broadleafcommerce/common/extensibility/context/merge/MergeManager.java
Merge branch 'ArloL-patch-2' into develop