KRACOEUS-6956: reorganizing prop dev spring beans to fit new project standards
KRACOEUS-6956: reorganizing prop dev spring beans to fit new project standards, renaming other spring files
Merge pull request #350 from leoherbie/pd_spring

KRACOEUS-6956: reorganizing prop dev spring beans to fit new project sta...
KRACOEUS-7493: Rice upgrade to fix mock issues. Not using the latest revision since I am waiting for some jiras to be closed.
Merge pull request #365 from gathreya/riceUpgrade

KRACOEUS-7493: Rice upgrade to fix mock issues. Not using the latest rev...