Fix for bug#1: Multiple containers in psuedo distributed mode.
Changes in this fix:
Port for talking to different flakes:
1. Command Line tool changes to pass -Dconfig.property=value from command line to java (which will override any values stored in the properties file). We use this to override -Dfloe.flake.port=xxxx for each container on a single machine.

Unique IPC sockets for heartbeats and control signals.
2. changed IPC heartbeat socket to use container id appended to the socket name so that flakes send hb to appropriate containers.
3. changed flake id from fid to a concatenation of cid and fid (cid + "-" + fid). This will be used for all communication between container and flakes on that container (even if fid repeats across containers).
Merge branch 'master' of https://github.com/usc-cloud/floe2