Moved resolver state handling to the bundle so we can guarantee state changes occur when operating on a bundle. (FELIX-851)