fixing G-Reg startup issue
merge script according to the changes in BPS
adding stratos common feature
Merge remote-tracking branch 'upstream/master'