Some improvements and upgrade to Akka 2.1.2

Cherry-picked "Some improvements", fixed upgrade to 2.1.2 in solution also.