merge bits appservers into appservers

minimal change to test merging bits into the general appservers, proper cleanup
of bits appservers to follow if testing is successful.

RT #6794

Change-Id: I51c6a6c339eda94e7b085a6f18ee05958fbeb8ef