Merge "Fix to properties load for blueprints-processor"