BATCH-2019: Updated to support Spring 3.1 profiles with properties