Merge "Add test to shelve the paused server: bug# 1745529"