LPS-33899

@shuyangzhou as per our conversation this reverts the previous changes and applies a different method to position the access controllers around finders and persistence