Merged REST Service functionality with PSC Services

Change-Id: Id0641b797271ebfdbd7e6573160d235dc1d3c149