Fixes #655 - Ensure that isActivie on Skus also takes into account the ‘available’ flag. Also, if the available flag is not explicitly set on a Sku then the Sku should still be marked as available.
Revert "Fixes #655 - Ensure that isActivie on Skus also takes into account the ‘available’ flag. Also, if the available flag is not explicitly set on a Sku then the Sku should still be marked as available."

This reverts commit 0dc7efc5fe80e546dca56397b7dcd1635de0f016.
#655 - Provide better docs for Sku availability and default the availability to ‘true’ rather than null
#655 - Fix broken test
#626 - Ensure we're not wiping out solr.xml info on server startup
(Cherry picked from 76d4fef867b60798864277ef1db0832d6317ed98)
#676  - Need to ensure that the Cart on CartState is owned by the newly registered customer.

(cherry picked from commit 4259b3ff6bda60acddfa2a07be8266245321fedb)
#676  - Need to ensure that the Cart on CartState is owned by the newly registered customer. - also for the Social Register Controller
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x