Updated code from hub repo.
Updated puppet files.
Resolved merge conflicts.
Removed next-two-weeks option.