Merge into master from pull request #299:

Update to attachment point logic.  When a packet-in is seen on the same attachment point as before, retain the old activeSince time.  Update unit test to account for 1 second offset. (https://github.com/floodlight/floodlight/pull/299)