[ASFXSWB667] leave index functionality but make it non automatic
[ASFXSWB667] rename to ensure index since that is what it does and fix tests
Merge pull request #40 from dwsla/ASFXSWB667

Asfxswb667