#1040 - Support extension of persistence for product option sku permutations from the admin
(cherry picked from commit 6f1ecb9)
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop
Refactored Page to add additional extension points.  #1041
Merge remote-tracking branch 'origin/develop' into advanced-bundle